From dadc0aa21df974005bc29274ad87104b6fdabf8e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 15:42:26 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 be8d5d8..de3a1cc 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
@@ -613,17 +613,20 @@
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.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(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){
+ list.add(waitList.get(Constants.ZERO));
}
}else {
if((waitList.size()> 0 || otherPassList.size()>0)){
--
Gitblit v1.9.3