From 37f9d55f69d393b729b7775d65810836e64171e7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 23 五月 2024 18:46:36 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 275 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 267 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 289c28d..19b9c4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -9,8 +9,10 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dto.ApproveDTO;
+import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.response.InternalHomeVO;
import com.doumee.service.business.ApproveService;
@@ -18,11 +20,13 @@
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.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.apache.xpath.operations.Bool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -37,6 +41,9 @@
@Autowired
private ApproveMapper approveMapper;
+
+ @Autowired
+ private ApproveJoinMapper approveJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -58,6 +65,9 @@
@Autowired
private CarDriverMapper carDriverMapper;
+
+ @Autowired
+ private VisitsMapper visitsMapper;
@Override
public Integer create(Approve approve) {
@@ -258,12 +268,12 @@
this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(approveList)){
+ if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
}
//澶勭悊鎶勯�佹暟鎹�
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(approveCopyList)){
+ if(CollectionUtils.isNotEmpty(approveCopyList)){
this.organizeApproveCopyData(approveTempl,approveParamList,businessId,approveList);
}
approveMapper.insertBatchSomeColumn(approveList);
@@ -290,8 +300,8 @@
approve.setIsdeleted(Constants.ZERO);
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
- approve.setStatus(Constants.ZERO);
- approve.setStatusInfo("寰呭鎵�");
+ approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鎵�");
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
approve.setLevel(i+1);
@@ -315,7 +325,7 @@
.eq(Member::getWorkStatus,Constants.ZERO)
.in(Member::getId,approveParam.getObjIds().split(",")));
List<Integer> userIds = new ArrayList<>();
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
+ if(CollectionUtils.isNotEmpty(memberList)){
userIds.addAll(memberList.stream().map(m->m.getId()).collect(Collectors.toList()));
}
//鍏姟鐢ㄨ溅 榛樿鍔犲叆 鍙告満鎶勯��
@@ -331,7 +341,7 @@
userIds.add(carDriver.getMemberId());
}
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(userIds)){
+ if(CollectionUtils.isNotEmpty(userIds)){
for (Integer memberId:userIds) {
Approve approve = new Approve();
approve.setCreateDate(new Date());
@@ -425,4 +435,253 @@
}
+ /**
+ * 鏁寸悊 瀹℃壒鏁版嵁
+ * @param businessId
+ * @param businessType
+ * @return
+ */
+ @Override
+ public ApproveDataVO arrangeApprovedData(Integer businessId, Integer businessType, Integer memberId){
+ ApproveDataVO approveDateVO = new ApproveDataVO();
+ approveDateVO.setCanBeApproved(Constants.ZERO);
+ List<Approve> approveGroupList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>().
+ select(Approve::getLevel,Approve::getType)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getObjId,businessId)
+ .isNotNull(Approve::getLevel)
+ .eq(Approve::getObjType,businessType)
+ .groupBy(Approve::getLevel,Approve::getType)
+ );
+ if(CollectionUtils.isEmpty(approveGroupList)){
+ return approveDateVO;
+ }
+ //鎵�鏈夌殑瀹℃壒璁板綍
+ List<Approve> approveAllList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .selectAs(Member::getName,Approve::getMemberName)
+ .selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(Company::getName,Approve::getCompanyName)
+ .leftJoin(Member.class,Member::getId,Approve::getChekorId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getObjId,businessId)
+ .eq(Approve::getObjType,businessType)
+ .orderByAsc(Approve::getType)
+ .orderByAsc(Approve::getLevel)
+ .orderByAsc(Approve::getId)
+ );
+ if(CollectionUtils.isEmpty(approveAllList)){
+ return approveDateVO;
+ }
+ List<Approve> approveList = approveAllList.stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(approveList)){
+ return approveDateVO;
+ }
+ approveDateVO.setCanBeApproved(this.canBeApproved(approveList,memberId));
+ //鏍规嵁瀹℃壒绾у埆 澶勭悊鏁版嵁
+ for (Approve approve:approveGroupList) {
+ approve.setApproveList(
+ approveList.stream().filter(i->Objects.nonNull(i.getLevel())&&i.getLevel().equals(approve.getLevel())).collect(Collectors.toList())
+ );
+ }
+ approveDateVO.setApproveList(approveGroupList);
+ approveDateVO.setCopyList(approveAllList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()));
+ return approveDateVO;
+ }
+
+
+ public Integer canBeApproved(List<Approve> approveList,Integer memberId){
+ //鑾峰彇鎵�鏈夊緟瀹℃壒鐨勬暟鎹�
+ List<Approve> waitApprovedList = approveList.stream().filter(i->i.getType().equals(Constants.ZERO)&&i.getStatus().equals(Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(waitApprovedList)){
+ //涓嬩釜瀹℃壒娴佺▼绛夌骇
+ Integer nextApprovedLevel = waitApprovedList.get(Constants.ZERO).getLevel();
+ //涓嬩釜瀹℃壒娴佺▼鐨� 鎵�鏈夋暟鎹�
+ List<Approve> nextApprovedList = waitApprovedList.stream().filter(i->i.getStatus().equals(Constants.ZERO)&&i.getLevel().equals(nextApprovedLevel)).collect(Collectors.toList());
+ //涓嬩釜瀹℃壒娴佺▼鍐� 濡傛灉瀛樺湪褰撳墠 鐢ㄦ埛鐨勬姄绱� 鍒欏彲浠ヨ繘琛屽鎵�
+ if(nextApprovedList.stream().filter(i->i.getChekorId().equals(memberId)).collect(Collectors.toList()).size()>0){
+ return Constants.ONE;
+ }
+ }
+ return Constants.ZERO;
+ }
+
+
+
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void approved(ApproveDTO approveDTO){
+ if(Objects.isNull(approveDTO)
+ || Objects.isNull(approveDTO.getObjId())
+ || Objects.isNull(approveDTO.getObjType())
+ || Objects.isNull(approveDTO.getStatus())
+ || Objects.isNull(approveDTO.getLoginUserInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(approveDTO.getStatus().equals(Constants.THREE)&&StringUtils.isBlank(approveDTO.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ嫆缁濊鏄�");
+ }
+ Approve approve = approveMapper.selectOne(new QueryWrapper<Approve>()
+ .lambda()
+ .eq(Approve::getObjId,approveDTO.getObjId())
+ .eq(Approve::getObjType,approveDTO.getObjType())
+ .last(" limit 1")
+ );
+ if(Objects.isNull(approve)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒鏁版嵁");
+ }
+ if(!approve.getStatus().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒璁板綍鐘舵�侀敊璇�!");
+ }
+
+ //澶勭悊瀹℃壒淇℃伅
+ approve.setStatus(approveDTO.getStatus());
+ approve.setCheckInfo(approveDTO.getCheckInfo());
+ approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString());
+ approve.setCheckorName(approve.getLoginUserInfo().getRealname());
+ approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"瀹℃壒閫氳繃":approveDTO.getCheckInfo());
+ Visits visits = new Visits();
+ CarUseBook carUseBook = new CarUseBook();
+ this.dealBusinessData(approveDTO,approve,visits,carUseBook);
+ //鏈骇鎵�鏈� 寰呭鎵硅褰�
+ List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .eq(Approve::getIsdeleted,Constants.ZERO)
+ .eq(Approve::getObjId,approveDTO.getObjId())
+ .eq(Approve::getObjType,approveDTO.getObjType())
+ .eq(Approve::getLevel,approve.getLevel())
+ .eq(Approve::getStatus,Constants.ONE)
+ .ne(Approve::getId,approve.getId())
+ );
+ //澶勭悊鏈瀹℃壒鐨勪笟鍔℃暟鎹�
+ approveMapper.updateById(approve);
+ //鏄惁澶勭悊 涓氬姟鏁版嵁
+ Boolean dealBusinessBean = false;
+ //瀹℃壒椹冲洖鎯呭喌
+ if(approveDTO.getStatus().equals(Constants.THREE)){
+ //淇敼鍏朵粬鎵�鏈夊緟瀹℃壒鍜屽鎵逛腑璁板綍鏁版嵁
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherUnPass)
+ .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .ne(Approve::getId,approve.getId()));
+ }else{
+ //澶勭悊鍏朵粬涓氬姟鏁版嵁
+ if(approve.getApproveType().equals(Constants.ZERO)&&approve.getIsEndCheck()==Constants.ONE){
+ //鎴栫 涓� 缁堝
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ dealBusinessBean = true;
+
+ }else if(approve.getApproveType().equals(Constants.ZERO)&&approve.getIsEndCheck()!=Constants.ONE){
+ //鎴栫 闈炵粓瀹� 鍒欏紑鍚笅涓�姝ヤ笟鍔℃祦绋�
+ /**澶勭悊鏈骇鏁版嵁**/
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ /**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.auditIng)
+ .eq(Approve::getStatus,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getLevel,(approve.getLevel()+1))
+ );
+
+ }else if(approve.getApproveType().equals(Constants.ONE)&&approve.getIsEndCheck()==Constants.ONE){
+ //浼氱 涓旂粓瀹�
+ if(approveList.size()==Constants.ZERO){
+ dealBusinessBean = true;
+ }
+ }
+ }
+
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ // 璁垮 涓夌被涓氬姟鏁版嵁
+ visitsMapper.updateById(visits);
+ if(dealBusinessBean){
+ //TODO 鍙戦�佸鎵归�氳繃娑堟伅
+
+ }else if(approveDTO.getStatus().equals(Constants.THREE)){
+ //TODO 瀹℃壒鏈�氳繃閫氱煡
+
+ }
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ // 甯傚唴澶栫敤杞︾敵璇�
+ carUseBookMapper.updateById(carUseBook);
+ if(dealBusinessBean){
+ //TODO 鍙戦�佸鎵归�氳繃娑堟伅
+
+ }else if(approveDTO.getStatus().equals(Constants.THREE)){
+ //TODO 瀹℃壒鏈�氳繃閫氱煡
+
+ }
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
+ //TODO 鐗╂祦杞﹂绾�
+
+ }
+ }
+
+ public void dealBusinessData(ApproveDTO approveDTO,Approve approve,Visits visits,CarUseBook carUseBook){
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ // 璁垮 涓夌被涓氬姟鏁版嵁
+ visits = visitsMapper.selectById(approveDTO.getObjId());
+ if(Objects.isNull(visits)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢宠璁板綍");
+ }
+ visits.setStatus(approveDTO.getStatus());
+ visits.setEditDate(new Date());
+ visits.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ // 甯傚唴澶栫敤杞︾敵璇�
+ carUseBook = carUseBookMapper.selectById(approveDTO.getObjId());
+ if(Objects.isNull(carUseBook)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鐢ㄨ溅璁板綍");
+ }
+ carUseBook.setStatus(approveDTO.getStatus());
+ carUseBook.setEditDate(new Date());
+ carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+ //濡傛灉閰嶇疆淇敼鍙告満 涓� 鍏ュ弬浜嗘洿鎹㈠悗鍙告満淇℃伅
+ if(approveDTO.getStatus()==Constants.TWO&&approve.getDriverParam().equals(Constants.ONE)){
+ CarDriver carDriver = carDriverMapper.selectById(approveDTO.getDriverId());
+ if(Objects.isNull(carDriver)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
+ }
+ carUseBook.setDriverId(carDriver.getId());
+ }
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
+ //TODO 鐗╂祦杞﹂绾�
+
+ }else{
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }
+
+
}
--
Gitblit v1.9.3