From ecbdab9da9488cc58a1ac7064f9cffde4792fba4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:51:01 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index b940e2e..7b9bfbb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -10,12 +10,16 @@
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,6 +28,8 @@
import java.util.Date;
import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* 瀹℃壒妯＄増淇℃伅琛⊿ervice瀹炵幇
@@ -38,7 +44,7 @@
@Autowired
private ApproveParamMapper approveParamMapper;
@Autowired
- private MemberMapper memberMapper;
+ private MemberJoinMapper memberJoinMapper;
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -67,6 +73,7 @@
template.setName(Constants.ApproveTmplType.getName(model.getType()));
approveTemplMapper.insert(template);
}
+ int level = 0;
if(model.getParamList()!=null && model.getParamList().size()>0){
for(ApproveParam param : model.getParamList()){
param.setCreateDate(date);
@@ -74,11 +81,14 @@
param.setEditDate(date);
param.setEditor(loginUserInfo.getId());
param.setIsdeleted(Constants.ZERO);
+// param.setLevel(level);
+ param.setMemberType(Constants.formatIntegerNum(param.getMemberType()));
param.setTemplId(template.getId());
param.setType(Constants.formatIntegerNum(param.getType()));
param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam()));
param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam()));
param.setApproveType(Constants.formatIntegerNum(param.getApproveType()));
+ level ++ ;
}
//鍏堟竻闄ゅ師鏉ユ墍鏈夌殑灏遍櫔閰嶇疆
approveParamMapper.delete(new UpdateWrapper<ApproveParam>().lambda()
@@ -86,7 +96,7 @@
//鎵归噺鎻掑叆鏂扮殑閰嶇疆
approveParamMapper.insertBatchSomeColumn(model.getParamList());
}
- return model.getId();
+ return 1;
}
@Override
@@ -144,7 +154,26 @@
@Override
public ApproveTempl findOne(ApproveTempl approveTempl) {
QueryWrapper<ApproveTempl> wrapper = new QueryWrapper<>(approveTempl);
- return approveTemplMapper.selectOne(wrapper);
+ ApproveTempl model = approveTemplMapper.selectOne(wrapper.lambda().last("limit 1"));
+ if(model!=null){
+ List<ApproveParam> approveParamList = approveParamMapper.selectList(new QueryWrapper<ApproveParam>()
+ .lambda().eq(ApproveParam::getIsdeleted,Constants.ZERO)
+ .eq(ApproveParam::getTemplId,model.getId())
+ .orderByAsc(ApproveParam::getLevel)
+ );
+ for (ApproveParam approveParam :approveParamList) {
+ if(StringUtils.isNotBlank(approveParam.getObjIds())){
+ approveParam.setMemberList(memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .in(Member::getId,approveParam.getObjIds().split(","))));
+ }
+ }
+ model.setParamList(approveParamList);
+ }
+ return model;
}
@Override
--
Gitblit v1.9.3