From a99c53cea03d87e71109824edb56cfcd33c38cbb Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 15:54:48 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 7e8bffc..72e088c 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
@@ -573,7 +573,7 @@
if (CollectionUtils.isNotEmpty(copyList)) {
Approve waitModel = new Approve();
waitModel.setApproveType(Constants.ONE);
- waitModel.setStatusInfo("鎶勯��");
+ waitModel.setTitle("鎶勯�佷汉");
waitModel.setStatus(Constants.ONE);
waitModel.setType(Constants.ONE);
waitModel.setApproveList(copyList);
@@ -594,6 +594,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);
//濡傛灉鏄崟浜哄鎵�
list.add(level);
return list;
@@ -607,19 +608,29 @@
dealGroupListBiz(level,levelApprove,approveGroupList,passList,refuseModel,waitList,otherPassList);
if(Objects.nonNull(refuseModel) && Objects.nonNull(refuseModel.getId())){
//瀛樺湪鎷掔粷鐨勶紝鍙渶瑕佽繑鍥炰竴鏉″鐞嗘暟鎹紝鍚庣画涓嶉渶瑕佸洖鏄�
+ refuseModel.setApproveType(Constants.ZERO);
list.add(refuseModel);
return list;
}
list.addAll(sortByCreateTime(passList));
if(Constants.equalsInteger(level.getApproveType(),Constants.ONE)){
//濡傛灉鏄細绛�
- if(waitList.size()>0){
+ if(waitList.size()>1){
Approve waitModel = new Approve();
waitModel.setApproveType(Constants.ONE);
- waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�")+"澶勭悊涓�");
+ 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() +"浜轰細绛�");
+ }
waitModel.setApproveList(waitList);
list.add(waitModel);
+ }else if(waitList.size()>0){
+ Approve approve = waitList.get(Constants.ZERO);
+ approve.setApproveType(Constants.ZERO);
+ list.add(approve);
}
}else {
if((waitList.size()> 0 || otherPassList.size()>0)){
@@ -627,18 +638,18 @@
waitModel.setApproveType(Constants.ONE);
if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
waitModel.setStatus(Constants.approveStatus.pass);
- waitModel.setStatusInfo("鎶勯�佹垨绛惧鎵逛汉");
+ waitModel.setTitle("瀹℃壒浜猴紙鎶勯�佹垨绛惧鎵逛汉锛�");
}else{
waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO);
}
-
List<Approve> approveList = new ArrayList<>();
approveList.addAll(waitList);
//濡傛灉鏄垨绛�
if(passList.size()>0){
approveList.addAll(otherPassList);
}
+ waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
waitModel.setApproveList(approveList);
list.add(waitModel);
}
--
Gitblit v1.9.3