From 53b9896582e9adf3cc19983ddf4fb82f73d78323 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 31 五月 2024 14:49:17 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 43286ff..7e8bffc 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 @@ -625,8 +625,14 @@ if((waitList.size()> 0 || otherPassList.size()>0)){ Approve waitModel = new Approve(); waitModel.setApproveType(Constants.ONE); - waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉"); - waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO); + if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ + waitModel.setStatus(Constants.approveStatus.pass); + waitModel.setStatusInfo("鎶勯�佹垨绛惧鎵逛汉"); + }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); //濡傛灉鏄垨绛� -- Gitblit v1.9.3