From d941bab56c15b52312c58707ff778f6140e0c5f4 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 九月 2024 17:47:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 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 9cef87e..31bb57e 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
@@ -478,7 +478,7 @@
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 = "銆愯瀹㈢敵璇枫�戠敵璇蜂汉 - ";
+ String title = "[璁垮鐢宠]鐢宠浜�-";
Map<String,Object> jsonMap = new HashMap<>();
for (int j = 0; j < memberList.size(); j++) {
Member member = memberList.get(j);
@@ -540,8 +540,8 @@
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
- approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鎵�");
- approve.setTitle("瀹℃壒浜�");
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"澶勭悊涓�");
+ approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"瀹℃壒涓�":approveParam.getRemark());
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
approve.setLevel(i+1);
@@ -577,7 +577,7 @@
if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){
title = title + visits.getName();
}else{
- title = "銆愯瀹㈡姤澶囥�戠敵璇蜂汉 - " + visits.getName();
+ title = "[璁垮鎶ュ]鐢宠浜�-" + visits.getName();
}
jsonMap.put("name", "璁块棶浜�:" + visits.getCompanyName() + " - " + visits.getReceptMemberName());
jsonMap.put("sTime", "鍏ュ洯鏃堕棿:" + DateUtil.DateToStr(visits.getStarttime() , "yyyy-MM-dd HH:mm"));
@@ -598,7 +598,7 @@
if(Objects.isNull(carUseBook)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅");
}
- title = "銆愮敤杞︾敵璇枫�戠敵璇蜂汉 - " + carUseBook.getMemberName();
+ title = "[鐢ㄨ溅鐢宠]鐢宠浜�-" + carUseBook.getMemberName();
jsonMap.put("name", "鐢宠浜�:" + carUseBook.getCompanyName() + " - " + carUseBook.getMemberName());
jsonMap.put("sTime", "寮�濮嬫椂闂�:" + DateUtil.DateToStr(carUseBook.getStartTime() , "yyyy-MM-dd HH:mm"));
jsonMap.put("eTime", "缁撴潫鏃堕棿:" + DateUtil.DateToStr(carUseBook.getEndTime() , "yyyy-MM-dd HH:mm"));
@@ -610,7 +610,7 @@
if(Objects.isNull(platformBooks)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅");
}
- title = "銆愮墿娴佽溅鍏ュ洯棰勭害銆戠敵璇蜂汉 - " + platformBooks.getDriverName();
+ title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName();
jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
@@ -802,7 +802,7 @@
private List<Approve> getLevelInfoFromList(Approve level,List<Approve> approveGroupList) {
List<Approve> list = new ArrayList<>();
if(Constants.equalsInteger(level.getApproveType(),Constants.TWO)){
- level.setApproveType(Constants.ZERO);
+ level.setApproveType(Constants.TWO);
//濡傛灉鏄崟浜哄鎵�
list.add(level);
return list;
@@ -829,11 +829,17 @@
waitModel.setType(Constants.ZERO);
waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"));
waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
- waitModel.setStatusInfo("澶勭悊涓�");
- if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)
- ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
- waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+ if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
+ waitModel.setStatusInfo("寰呭鐞�");
+ }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.auditIng)){
+ waitModel.setStatusInfo("澶勭悊涓�");
}
+
+ waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+// if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)
+// ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
+// waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+// }
if(CollectionUtils.isNotEmpty(waitList)){
waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate());
}
@@ -848,15 +854,17 @@
}else {
if((waitList.size()> 0 || otherPassList.size()>0)){
Approve waitModel = new Approve();
- waitModel.setApproveType(Constants.ONE);
+ waitModel.setApproveType(Constants.ZERO);
if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
- waitModel.setStatus(Constants.approveStatus.pass);
+ waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ONE);
waitModel.setTitle("瀹℃壒浜猴紙鎶勯�佹垨绛惧鎵逛汉锛�");
}else{
+ waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ZERO);
- waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
- waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO);
+ //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
+ waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
+
}
List<Approve> approveList = new ArrayList<>();
approveList.addAll(waitList);
@@ -870,7 +878,11 @@
if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.pass)){
waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
}else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
- waitModel.setMemberName("澶勭悊涓�");
+ waitModel.setMemberName(waitList.size() +"浜烘垨绛�");
+ waitModel.setStatusInfo("寰呭鐞�");
+ }else{
+ waitModel.setMemberName(waitList.size() +"浜烘垨绛�");
+ waitModel.setStatusInfo("澶勭悊涓�");
}
waitModel.setApproveList(approveList);
list.add(waitModel);
@@ -1050,6 +1062,23 @@
return Constants.ZERO;
}
+ @Override
+ public String getApproveUserName(Integer businessId,Integer businessType){
+ List<Approve> approveList = 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,businessId)
+ .eq(Approve::getObjType,businessType)
+ .eq(Approve::getType,Constants.ZERO)
+ .eq(Approve::getStatus,Constants.approveStatus.auditIng)
+ );
+ if(CollectionUtils.isNotEmpty(approveList)){
+ List<String> names = approveList.stream().map(m->m.getMemberName()).collect(Collectors.toList());
+ return String.join(",",names);
+ }
+ return null;
+ }
@@ -1146,7 +1175,7 @@
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
.set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
- .set(Notices::getInfo,"瀹℃壒鏈�氳繃")
+ .set(Notices::getInfo,"宸叉嫆缁�")
.set(Notices::getReaded,Constants.ONE)
.set(Notices::getParam2,Constants.TWO)
.set(Notices::getStatus,Constants.ONE)
@@ -1159,7 +1188,7 @@
.set(Notices::getSendacopy,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
.set(Notices::getParam2,Constants.TWO)
- .set(Notices::getInfo,"瀹℃壒鏈�氳繃")
+ .set(Notices::getInfo,"宸叉嫆缁�")
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
.eq(Notices::getReaded,Constants.ZERO)
@@ -1208,8 +1237,6 @@
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(),"鏈煡璇㈠埌涓氬姟鏁版嵁瀵硅薄!璇峰埛鏂伴噸璇�");
}
}
@@ -1271,6 +1298,7 @@
.set(Notices::getEditDate,new Date())
.set(Notices::getReaded,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getInfo,Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?"宸查�氳繃":"宸叉嫆缁�")
.set(dealBusinessBean,Notices::getParam2,Constants.ONE)
.set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.eq(Notices::getId,notices.getId())
@@ -1312,14 +1340,14 @@
String info = "";
List<String> memberNameList = Arrays.asList(memberNames.split(","));
if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
- info = "寰� "+memberNameList.get(0)+" 澶勭悊涓�";
+ info = "寰�"+memberNameList.get(0)+"澶勭悊涓�";
}else{
- info = "寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑";
+ info = "寰�"+memberNameList.get(0)+"绛�"+memberNameList.size()+"浜哄鐞嗕腑";
}
//鏇存柊璇ヤ笟鍔℃暟鎹殑鎵�鏈夎褰曚俊鎭�
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(!dealBusinessBean,Notices::getInfo,info)
- .set(dealBusinessBean,Notices::getInfo,"瀹℃壒閫氳繃")
+ .set(dealBusinessBean,Notices::getInfo,"宸查�氳繃")
.set(Notices::getParam5,memberNames)
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType()));
@@ -1335,7 +1363,7 @@
copyNotices.setEditDate(new Date());
copyNotices.setParam2("2");
copyNotices.setParam3("");
- copyNotices.setInfo("瀹℃壒閫氳繃");
+ copyNotices.setInfo("宸查�氳繃");
copyNotices.setUserId(copyApprove.getChekorId());
copyNotices.setStatus(Constants.ZERO);
copyNotices.setSendacopy(Constants.ONE);
@@ -1378,9 +1406,9 @@
notices.setParam5(memberNames);
notices.setRemark(nextDealApprove.getMemberName());
if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
- notices.setInfo("寰� "+memberNameList.get(0)+" 澶勭悊涓�");
+ notices.setInfo("寰�"+memberNameList.get(0)+"澶勭悊涓�");
}else{
- notices.setInfo("寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑");
+ notices.setInfo("寰�"+memberNameList.get(0)+"绛�"+memberNameList.size()+"浜哄鐞嗕腑");
}
noticesJoinMapper.insert(newNotices);
}
@@ -1400,6 +1428,7 @@
visits.setEditDate(new Date());
visits.setEditor(approveDTO.getLoginUserInfo().getMemberId());
visitsMapper.updateById(visits);
+
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
this.updDriver(approveDTO,approve,true);
--
Gitblit v1.9.3