From ca133ed72b297141f906810f81413e15d3d66333 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 03 七月 2024 18:24:37 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 99 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 39 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 daffdbf..384cdcc 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
@@ -36,6 +36,7 @@
import org.apache.xpath.operations.Bool;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -257,17 +258,19 @@
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
).count()
);
+ //宸插鐞嗘暟鎹�
internalHomeVO.setNoticeDealNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ &&StringUtils.equals(i.getParam4(),i.getUserId().toString())
&&Constants.equalsInteger(i.getStatus(),Constants.ONE)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
).count()
);
-
+ //鎴戝彂璧风殑鏁版嵁
internalHomeVO.setNoticeCreateNum(
noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
);
-
+ //鎶勯�佹垜鐨勬暟鎹�
internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
@@ -374,7 +377,8 @@
if(CollectionUtils.isNotEmpty(approveCopyList)){
this.organizeApproveCopyData(approveTempl,approveParamList,businessId,approveList);
}
- approveMapper.insertBatchSomeColumn(approveList);
+ approveJoinMapper.insert(approveList);
+// approveJoinMapper.insert(approveList);
}
@@ -396,6 +400,7 @@
createUserApprove.setIsdeleted(Constants.ZERO);
createUserApprove.setTemplatId(approveTempl.getId());
createUserApprove.setChekorId(createMember.getId());
+ createUserApprove.setCheckDate(createUserApprove.getCreateDate());
createUserApprove.setStatus(Constants.approveStatus.pass);
createUserApprove.setTitle("鍙戣捣鐢宠");
createUserApprove.setStatusInfo("");
@@ -467,6 +472,7 @@
approve.setChekorId(memberId);
approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鎵�");
+ approve.setTitle("瀹℃壒浜�");
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
approve.setLevel(i+1);
@@ -684,11 +690,6 @@
for(Approve level:levelList){
List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
approveDateVO.getApproveList().addAll(tlist);
- if(tlist.size() ==0
- ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
- ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
- break;
- }
}
}
@@ -702,6 +703,7 @@
waitModel.setApproveList(copyList);
approveDateVO.getApproveList().add(waitModel);
}
+ System.out.println(JSONObject.toJSONString(approveDateVO));
return approveDateVO;
}
@@ -781,19 +783,14 @@
if(CollectionUtils.isNotEmpty(approveList)){
waitModel.setCreateDate(approveList.get(Constants.ZERO).getCreateDate());
}
- waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
+ if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.pass)){
+ waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
+ }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
+ waitModel.setMemberName("澶勭悊涓�");
+ }
waitModel.setApproveList(approveList);
list.add(waitModel);
}
- //濡傛灉鏄垨绛�
-// if(otherPassList.size()>0){
-// Approve waitModel = new Approve();
-// waitModel.setApproveType(Constants.ONE);
-// waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�")+"锛堟妱閫佹垨绛惧鎵逛汉锛�");
-// waitModel.setStatus(Constants.ONE);
-// waitModel.setApproveList(otherPassList);
-// list.add(waitModel);
-// }
}
@@ -816,7 +813,7 @@
}else if(Constants.equalsInteger(Constants.approveStatus.auditIng,approve.getStatus())||Constants.equalsInteger(Constants.approveStatus.wait,approve.getStatus())){
waitList.add(approve);
}else if(Constants.equalsInteger(Constants.approveStatus.unPass,approve.getStatus())){
- refuseModel = approve;
+ BeanUtils.copyProperties(approve,refuseModel);
}
}
}
@@ -1009,6 +1006,7 @@
.eq(Notices::getUserId,approve.getChekorId())
.eq(Notices::getSendacopy,Constants.ZERO)
.eq(Notices::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 ")
);
if(Objects.isNull(notices)){
log.info("鏈煡璇㈠埌閫氱煡璁板綍");
@@ -1020,7 +1018,7 @@
approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString());
approve.setCheckorName(approveDTO.getLoginUserInfo().getRealname());
approve.setCheckDate(new Date());
- approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"宸插悓鎰�":approveDTO.getCheckInfo());
+ approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"宸插悓鎰�":"宸查┏鍥�");
//鏈骇鎵�鏈� 寰呭鎵硅褰�
List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
new MPJLambdaWrapper<Approve>()
@@ -1048,10 +1046,12 @@
Boolean dealBusinessBean = false;
//瀹℃壒椹冲洖鎯呭喌
if(approveDTO.getStatus().equals(Constants.THREE)){
+ dealBusinessBean = true;
//淇敼鍏朵粬鎵�鏈夊緟瀹℃壒鍜屽鎵逛腑璁板綍鏁版嵁
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
.set(Approve::getStatus,Constants.approveStatus.otherUnPass)
+ .set(Approve::getCheckDate,new Date())
.in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
.eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
@@ -1081,7 +1081,6 @@
);
}
}
- return;
}else{
//澶勭悊鍏朵粬涓氬姟鏁版嵁
if((Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)
@@ -1091,6 +1090,7 @@
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
.set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .set(Approve::getCheckDate,new Date())
.in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
}
dealBusinessBean = true;
@@ -1102,17 +1102,24 @@
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
.set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .set(Approve::getCheckDate,new Date())
.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)
+ .set(Approve::getTitle,"瀹℃壒浜�")
+ .set(Approve::getCheckDate,new Date())
.eq(Approve::getStatus,Constants.approveStatus.wait)
.eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
.eq(Approve::getLevel,(approve.getLevel()+1))
);
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ this.updDriver(approveDTO,approve,false);
+ }
}else if(approve.getApproveType().equals(Constants.ONE)){
//浼氱 涓旂粓瀹�
//鏃犱粬浜哄鎵圭殑鎯呭喌 鍒欎慨鏀规暟鎹姸鎬�
@@ -1215,7 +1222,7 @@
.eq(Approve::getType,Constants.ZERO)
.eq(Approve::getLevel,(approve.getLevel() + Constants.ONE))
);
- if(CollectionUtils.isNotEmpty(nextApproveList)){
+ if(CollectionUtils.isEmpty(nextApproveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴佹暟鎹紓甯�");
}
Notices newNotices = new Notices();
@@ -1255,23 +1262,7 @@
visitsMapper.updateById(visits);
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
- // 甯傚唴澶栫敤杞︾敵璇�
- CarUseBook 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&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
- CarDriver carDriver = carDriverMapper.selectById(approveDTO.getDriverId());
- if(Objects.isNull(carDriver)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
- }
- carUseBook.setDriverId(carDriver.getId());
- }
- carUseBookMapper.updateById(carUseBook);
+ this.updDriver(approveDTO,approve,true);
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
//TODO 鐗╂祦杞﹂绾�
@@ -1281,4 +1272,34 @@
}
+ public void updDriver(ApproveDTO approveDTO,Approve approve,Boolean dealBusinessBean){
+ // 甯傚唴澶栫敤杞︾敵璇�
+ CarUseBook carUseBook = carUseBookMapper.selectById(approveDTO.getObjId());
+ if(Objects.isNull(carUseBook)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鐢ㄨ溅璁板綍");
+ }
+ if(dealBusinessBean){
+ carUseBook.setStatus(approveDTO.getStatus());
+ }else{
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ carUseBook.setStatus(Constants.ONE);
+ }
+ }
+ carUseBook.setEditDate(new Date());
+ carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+ //濡傛灉閰嶇疆淇敼鍙告満 涓� 鍏ュ弬浜嗘洿鎹㈠悗鍙告満淇℃伅
+ if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
+ CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getIsdeleted,Constants.ZERO)
+ .eq(CarDriver::getStatus,Constants.ZERO)
+ .eq(CarDriver::getMemberId,approveDTO.getDriverId()));
+ if(Objects.isNull(carDriver)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
+ }
+ carUseBook.setDriverId(carDriver.getMemberId());
+ }
+ carUseBookMapper.updateById(carUseBook);
+ }
+
+
}
--
Gitblit v1.9.3