From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 385 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 259 insertions(+), 126 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 ecb91fd..804ee30 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
@@ -1,7 +1,6 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -37,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;
@@ -89,6 +89,12 @@
private CarUseBookJoinMapper carUseBookJoinMapper;
@Autowired
private NoticesJoinMapper noticesJoinMapper;
+ @Autowired
+ private PlatformBooksMapper platformBooksMapper;
+ @Autowired
+ private PlatformJobMapper platformJobMapper;
+ @Autowired
+ private PlatformLogMapper platformLogMapper;
@@ -258,17 +264,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)
@@ -373,9 +381,9 @@
//澶勭悊鎶勯�佹暟鎹�
if(CollectionUtils.isNotEmpty(approveCopyList)){
- this.organizeApproveCopyData(approveTempl,approveParamList,businessId,approveList);
+ this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
}
- approveMapper.insertBatchSomeColumn(approveList);
+ approveJoinMapper.insert(approveList);
}
@@ -397,6 +405,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("");
@@ -410,15 +419,21 @@
createUserApprove.setType(Constants.ZERO);
approveList.add(createUserApprove);
+ //鏌ヨ鎵�鏈夊緟澶勭悊浜�
+
//瀹℃壒涓氬姟鏁版嵁
for (int i = 0; i < approveParamList.size(); i++) {
ApproveParam approveParam = approveParamList.get(i);
List<Integer> ids = this.getApproveUserIds(approveParam,createMember);
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().in(Member::getId,ids));
+ List<String> memberNameList =memberList.stream().map(m->m.getName()).collect(Collectors.toList());
+ String memberNames = String.join(",",memberNameList);
Integer noticeType = Constants.approveTypeToNoticeType(approveTempl.getType());
String title = "銆愯瀹㈢敵璇枫�戠敵璇蜂汉 - ";
Map<String,Object> jsonMap = new HashMap<>();
- for (int j = 0; j < ids.size(); j++) {
- Integer memberId = ids.get(j);
+ for (int j = 0; j < memberList.size(); j++) {
+ Member member = memberList.get(j);
+ Integer memberId = member.getId();
//鐢熸垚寰呭姙 notices 琛ㄦ暟鎹�
if(i==0){
if(jsonMap.isEmpty()){
@@ -442,6 +457,9 @@
notices.setInfo("澶勭悊涓�");
noticesJoinMapper.insert(notices);
}
+ if(CollectionUtils.isEmpty(memberList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌瀹℃壒浜轰俊鎭�");
+ }
Notices notices = new Notices();
notices.setCreateDate(new Date());
notices.setIsdeleted(Constants.ZERO);
@@ -457,7 +475,13 @@
notices.setSendacopy(Constants.ZERO);
notices.setParam2("0");
notices.setParam3("");
- notices.setInfo("寰呭鐞�");
+ notices.setParam5(memberNames);
+ notices.setRemark(member.getName());
+ if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
+ notices.setInfo("寰�"+memberNameList.get(0)+"澶勭悊涓�");
+ }else{
+ notices.setInfo("寰�"+memberNameList.get(0)+"绛�"+memberList.size()+"浜哄鐞嗕腑");
+ }
noticesJoinMapper.insert(notices);
}
Approve approve = new Approve();
@@ -468,6 +492,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);
@@ -550,18 +575,18 @@
if(CollectionUtils.isNotEmpty(memberList)){
userIds.addAll(memberList.stream().map(m->m.getId()).collect(Collectors.toList()));
}
- //鍏姟鐢ㄨ溅 榛樿鍔犲叆 鍙告満鎶勯��
- if(approveTempl.getType()==Constants.THREE||approveTempl.getType()==Constants.FOUR){
- CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
- if(Objects.isNull(carUseBook)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
- }
- CarDriver carDriver = carDriverMapper.selectById(carUseBook.getDriverId());
- if(Objects.isNull(carDriver)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鍙告満淇℃伅");
- }
- userIds.add(carDriver.getMemberId());
- }
+ //鍏姟鐢ㄨ溅 榛樿鍔犲叆 鍙告満鎶勯�� 2024骞�6鏈�28鏃�16:49:08 鍙告満鎶勯�佷慨鏀瑰埌 瀹℃壒涓氬姟鏃惰繘琛屽彂閫�
+// if(approveTempl.getType()==Constants.THREE||approveTempl.getType()==Constants.FOUR){
+// CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
+// if(Objects.isNull(carUseBook)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鐢ㄨ溅鐢宠淇℃伅");
+// }
+// CarDriver carDriver = carDriverMapper.selectById(carUseBook.getDriverId());
+// if(Objects.isNull(carDriver)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓烘煡璇㈠埌鍙告満淇℃伅");
+// }
+// userIds.add(carDriver.getMemberId());
+// }
if(CollectionUtils.isNotEmpty(userIds)){
for (Integer memberId:userIds) {
@@ -570,6 +595,7 @@
approve.setIsdeleted(Constants.ZERO);
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
+ approve.setObjType(approveTempl.getType());
approve.setObjId(businessId);
approve.setType(Constants.ONE);
approveList.add(approve);
@@ -603,7 +629,7 @@
if(Objects.isNull(memberCompany)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇痆鎸囧畾瀹℃壒閮ㄩ棬鏈煡璇㈠埌]");
}
- Company auditCompany = this.getAuditCompanyHead(memberCompany.getParentId(),approveParam.getObjLevel());
+ Company auditCompany = this.getAuditCompanyHead(memberCompany.getId(),approveParam.getObjLevel());
if(Objects.isNull(auditCompany)){
//瀹℃壒閮ㄩ棬涓虹┖ 鑷姩娴佽浆涓嬩竴绾у鎵归厤缃�
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇痆鎸囧畾瀹℃壒閮ㄩ棬鏈煡璇㈠埌]");
@@ -612,7 +638,7 @@
Member headMember = memberMapper.selectById(auditCompany.getHeadId());
if(Objects.isNull(headMember)){
//鏈煡璇㈠埌閮ㄩ棬璐熻矗浜� 鏍规嵁閰嶇疆澶勭悊 鐢变笂绾т富绠′唬鏇垮鏍�/鐩存帴缁撴潫娴佺▼
- if(approveParam.getNoleaderOpt().equals(Constants.ONE)&&!Objects.isNull(auditCompany.getParentId())){
+ if(Constants.equalsInteger(approveParam.getNoleaderOpt(),Constants.ONE)&&Objects.nonNull(auditCompany.getParentId())){
auditCompany = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getId,auditCompany.getParentId()));
//鏃犵埗绾� 鐩存帴娴佷紶涓嬩竴绾у鎵�
if(Objects.isNull(auditCompany)){
@@ -627,9 +653,11 @@
userIds.add(headMember.getId());
}
}else{
- //娣诲姞瀹℃壒浜�
- userIds.add(headMember.getId());
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇痆鎸囧畾瀹℃壒閮ㄩ棬涓荤鏈煡璇㈠埌]");
}
+ }else{
+ //娣诲姞瀹℃壒浜�
+ userIds.add(headMember.getId());
}
}
}
@@ -644,9 +672,9 @@
* @param objLevel 鏌ヨ绾у埆
*/
public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
- Integer queryLevel = Constants.ZERO;
Company auditCompany = companyMapper.selectById(companyId);
- while(queryLevel.equals(objLevel)){
+ Integer queryLevel = Constants.ONE;
+ while(queryLevel<objLevel){
auditCompany = companyMapper.selectById(auditCompany.getParentId());
if(Objects.isNull(auditCompany)){
return null;
@@ -675,6 +703,8 @@
.eq(Approve::getObjId,businessId)
.eq(Approve::getObjType,businessType)
.orderByAsc(Approve::getLevel)
+ .orderByAsc(Approve::getStatus)
+
);
//鏌ユ壘鍏ㄩ儴levelList
@@ -685,11 +715,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;
- }
}
}
@@ -697,12 +722,14 @@
if (CollectionUtils.isNotEmpty(copyList)) {
Approve waitModel = new Approve();
waitModel.setApproveType(Constants.ONE);
+ waitModel.setCheckDate(copyList.get(Constants.ZERO).getCheckDate());
waitModel.setTitle("鎶勯�佷汉");
waitModel.setStatus(copyList.get(Constants.ZERO).getStatus());
waitModel.setType(Constants.ONE);
waitModel.setApproveList(copyList);
approveDateVO.getApproveList().add(waitModel);
}
+ System.out.println(JSONObject.toJSONString(approveDateVO));
return approveDateVO;
}
@@ -782,19 +809,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);
-// }
}
@@ -817,7 +839,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);
}
}
}
@@ -1010,6 +1032,8 @@
.eq(Notices::getUserId,approve.getChekorId())
.eq(Notices::getSendacopy,Constants.ZERO)
.eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getStatus,Constants.ZERO)
+ .last(" limit 1 ")
);
if(Objects.isNull(notices)){
log.info("鏈煡璇㈠埌閫氱煡璁板綍");
@@ -1021,7 +1045,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>()
@@ -1049,40 +1073,41 @@
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())
.ne(Approve::getId,approve.getId()));
//澶勭悊鎵�鏈塏otice閫氱煡涓哄凡澶勭悊
- if(approve.getApproveType().equals(Constants.ZERO)){
- //淇敼鑷繁鐨勯�氱煡璁板綍
+ //淇敼鑷繁鐨勯�氱煡璁板綍
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getEditDate,new Date())
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
+ .set(Notices::getInfo,"瀹℃壒鏈�氳繃")
+ .set(Notices::getReaded,Constants.ONE)
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getId,notices.getId())
+ );
+ //淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
+ if (!Constants.equalsInteger(approve.getApproveType(),Constants.TWO)){
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
- .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
- .set(Notices::getReaded,Constants.ONE)
- .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getSendacopy,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
- .eq(Notices::getId,notices.getId())
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getInfo,"瀹℃壒鏈�氳繃")
+ .eq(Notices::getObjId,notices.getObjId())
+ .eq(Notices::getObjType,notices.getObjType())
+ .eq(Notices::getReaded,Constants.ZERO)
+ .ne(Notices::getId,notices.getId())
);
- //淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
- if (!Constants.equalsInteger(approve.getApproveType(),Constants.TWO)){
- noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
- .set(Notices::getEditDate,new Date())
- .set(Notices::getSendacopy,Constants.ONE)
- .set(Notices::getStatus,Constants.ONE)
- .set(Notices::getParam2,Constants.TWO)
- .eq(Notices::getObjId,notices.getObjId())
- .eq(Notices::getObjType,notices.getObjType())
- .eq(Notices::getReaded,Constants.ZERO)
- .ne(Notices::getId,notices.getId())
- );
- }
}
- return;
}else{
//澶勭悊鍏朵粬涓氬姟鏁版嵁
if((Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)
@@ -1092,6 +1117,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;
@@ -1103,22 +1129,60 @@
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.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
+ Visits visits = visitsMapper.selectById(approve.getObjId());
+ if(Objects.nonNull(visits)){
+ if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁瀵硅薄!璇峰埛鏂伴噸璇�");
+ }
+ }
+
+
+ }else 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)){
//浼氱 涓旂粓瀹�
//鏃犱粬浜哄鎵圭殑鎯呭喌 鍒欎慨鏀规暟鎹姸鎬�
if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){
dealBusinessBean = true;
+ }else{
+ if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
+ /**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+ 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);
+ }
}
}
this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
@@ -1136,6 +1200,14 @@
* @param approveList 鍚岀骇寰呭鎵规暟鎹�
*/
public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){
+ //鏈紑鍚笅涓�绾ф椂锛屾搷浣滃悗鐨勫緟瀹℃壒浜�
+ String memberNames =notices.getParam5()
+ .replaceAll(","+notices.getRemark(),"")
+ .replaceAll(notices.getRemark()+",","")
+ .replaceAll(notices.getRemark(),"");
+
+
+
//1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
@@ -1147,98 +1219,114 @@
);
if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){
//鎴栫
- //2銆佹洿鏂颁粬浜虹殑鍚岀骇璁板綍 涓烘妱閫�
+ //2銆佹洿鏂颁粬浜虹殑鍚岀骇璁板綍 涓烘妱閫� 骞舵洿鏂� info 淇℃伅
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
- .set(Notices::getReaded,Constants.ONE)
+ .set(Notices::getReaded,Constants.ZERO)
.set(Notices::getSendacopy,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
.set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.set(dealBusinessBean,Notices::getParam2,Constants.ONE)
.eq(Notices::getObjId,notices.getObjId())
+ .eq(Notices::getStatus,Constants.ZERO)
.eq(Notices::getObjType,notices.getObjType())
.ne(Notices::getId,notices.getId())
);
//3銆佸鏋滀笉鏄粓瀹＄敓鎴愪笅涓�绾х殑鏁版嵁璁板綍
if(Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)&&!dealBusinessBean){
- this.saveNextNotice(notices,approve);
+ memberNames = this.saveNextNotice(notices,approve);
}
}else if(Constants.equalsInteger(approve.getApproveType(),Constants.ONE)){
//浼氱
//2銆佸鏋滄槸鏈�鍚庝竴浣嶅鎵逛汉 涓斾笉鏄粓瀹″紑鍚笅涓�绾ф暟鎹�
if(Constants.equalsInteger(Constants.ZERO,approveList.size())){
if(Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
- this.saveNextNotice(notices,approve);
+ memberNames = this.saveNextNotice(notices,approve);
}
}
}else{
//鍗曚汉绛�
//2銆� 鏄惁鏄粓瀹� 寮�鍚笅涓�绾ф暟鎹�
if(Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
- this.saveNextNotice(notices,approve);
+ memberNames = this.saveNextNotice(notices,approve);
}
}
+ String info = "";
+ List<String> memberNameList = Arrays.asList(memberNames.split(","));
+ if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
+ info = "寰� "+memberNameList.get(0)+" 澶勭悊涓�";
+ }else{
+ info = "寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑";
+ }
+ //鏇存柊璇ヤ笟鍔℃暟鎹殑鎵�鏈夎褰曚俊鎭�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(!dealBusinessBean,Notices::getInfo,info)
+ .set(dealBusinessBean,Notices::getInfo,"瀹℃壒閫氳繃")
+ .set(Notices::getParam5,memberNames)
+ .eq(Notices::getObjId,notices.getObjId())
+ .eq(Notices::getObjType,notices.getObjType()));
+
//缁堝涓氬姟 涓� 澶勭悊鏁版嵁 杩涜鎶勯�佸彂閫�
if (Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE) && dealBusinessBean) {
if(CollectionUtils.isNotEmpty(copyList)){
- Notices copyNotices = new Notices();
for (Approve copyApprove:copyList) {
- if(Objects.isNull(copyNotices)){
- BeanUtils.copyProperties(notices,copyNotices);
- notices.setId(null);
- notices.setCreateDate(new Date());
- notices.setEditDate(new Date());
- notices.setParam2("2");
- notices.setParam3("");
- notices.setUserId(copyApprove.getChekorId());
- notices.setStatus(Constants.ZERO);
- notices.setSendacopy(Constants.ONE);
- notices.setReaded(Constants.ZERO);
- noticesJoinMapper.insert(notices);
- }else{
- notices.setId(null);
- notices.setUserId(copyApprove.getChekorId());
- noticesJoinMapper.insert(notices);
- }
+ Notices copyNotices = new Notices();
+ BeanUtils.copyProperties(notices,copyNotices);
+ copyNotices.setId(null);
+ copyNotices.setCreateDate(new Date());
+ copyNotices.setEditDate(new Date());
+ copyNotices.setParam2("2");
+ copyNotices.setParam3("");
+ copyNotices.setInfo("瀹℃壒閫氳繃");
+ copyNotices.setUserId(copyApprove.getChekorId());
+ copyNotices.setStatus(Constants.ZERO);
+ copyNotices.setSendacopy(Constants.ONE);
+ copyNotices.setReaded(Constants.ZERO);
+ noticesJoinMapper.insert(copyNotices);
}
}
-
-
}
}
- public void saveNextNotice(Notices notices,Approve approve){
- List<Approve> nextApproveList = approveJoinMapper.selectList(new QueryWrapper<Approve>()
- .lambda()
+
+ public String saveNextNotice(Notices notices,Approve approve){
+ List<Approve> nextApproveList = approveJoinMapper.selectJoinList(Approve.class,new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .selectAs(Member::getName,Approve::getMemberName)
+ .leftJoin(Member.class,Member::getId,Approve::getChekorId)
.eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
.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();
+ List<String> memberNameList =nextApproveList.stream().map(m->m.getMemberName()).collect(Collectors.toList());
+ String memberNames = String.join(",",memberNameList);
for (Approve nextDealApprove:nextApproveList) {
- if(Objects.isNull(newNotices)){
- BeanUtils.copyProperties(notices,newNotices);
- notices.setId(null);
- notices.setCreateDate(new Date());
- notices.setParam2("0");
- notices.setParam3("");
- notices.setEditDate(new Date());
- notices.setUserId(nextDealApprove.getChekorId());
- notices.setStatus(Constants.ZERO);
- notices.setSendacopy(Constants.ZERO);
- notices.setReaded(Constants.ZERO);
- noticesJoinMapper.insert(notices);
+ Notices newNotices = new Notices();
+ BeanUtils.copyProperties(notices,newNotices);
+ newNotices.setId(null);
+ newNotices.setCreateDate(new Date());
+ newNotices.setParam2("0");
+ newNotices.setParam3("");
+ newNotices.setEditDate(new Date());
+ newNotices.setUserId(nextDealApprove.getChekorId());
+ newNotices.setStatus(Constants.ZERO);
+ newNotices.setSendacopy(Constants.ZERO);
+ newNotices.setReaded(Constants.ZERO);
+ notices.setParam5(memberNames);
+ notices.setRemark(nextDealApprove.getMemberName());
+ if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
+ notices.setInfo("寰� "+memberNameList.get(0)+" 澶勭悊涓�");
}else{
- notices.setId(null);
- notices.setUserId(nextDealApprove.getChekorId());
- noticesJoinMapper.insert(notices);
+ notices.setInfo("寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑");
}
+ noticesJoinMapper.insert(newNotices);
}
+ return memberNames;
}
public void dealBusinessData(ApproveDTO approveDTO,Approve approve){
@@ -1256,29 +1344,74 @@
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 鐗╂祦杞﹂绾�
+ //鐗╂祦杞﹂绾�
+ PlatformBooks platformBooks = platformBooksMapper.selectById(approveDTO.getObjId());
+ if(Objects.isNull(platformBooks)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐗╂祦杞﹂绾﹁褰�");
+ }
+ platformBooks.setStatus(approveDTO.getStatus());
+ platformBooks.setEditDate(new Date());
+ platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
+
+ //鐢熸垚浠诲姟璁板綍
+ PlatformJob platformJob = platformBooks.toPlatformJob();
+ platformJobMapper.insert(platformJob);
+ platformBooks.setJobId(platformJob.getId());
+ platformBooksMapper.updateById(platformBooks);
+ //鐢熸垚浠诲姟鎿嶄綔璁板綍
+ PlatformLog platformLog = new PlatformLog();
+ platformLog.setCreateDate(new Date());
+ platformLog.setJobId(platformJob.getId());
+ platformLog.setIsdeleted(Constants.ZERO);
+ platformLog.setObjType(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
+ platformLog.setObjId(platformJob.getId().toString());
+ platformLog.setAfterContent(JSONObject.toJSONString(platformJob));
+ platformLogMapper.insert(platformLog);
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ //澶勭悊閫氳繃 鏄剧ず鎵�鏈夌殑鎶勯�佽褰�
+ approveMapper.update(null,new UpdateWrapper<Approve>().lambda().set(Approve::getStatus,Constants.TWO)
+ .set(Approve::getCheckDate,new Date())
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getType,Constants.ONE)
+ );
+ }
+ }
+
+
+ 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