From 468e5679f9d9bb6fda50fd234575f3e8d60b3a5e Mon Sep 17 00:00:00 2001 From: yxm <zhp1521624> Date: Wed, 17 Jul 2024 17:25:06 +0800 Subject: [PATCH] 项目施工审批流优化 --- skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java index 626a6dd..b4442f5 100644 --- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java +++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java @@ -122,7 +122,6 @@ SgDeviceDO sgDeviceDO = new SgDeviceDO(); sgDeviceDO.setId(dId); sgDeviceDO.setDeviceName(deList.get(0).getDeviceName()); - sgDeviceDO.setStatus( deList.get(0).getDeviceStatus()); List<SgGxStepDO> stepDOS = deList.stream().filter(s->s.getReportStatus()==null || s.getReportStatus()!=4).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList()); List<SgGxStepDO> stepOver = stepDOS.stream().filter(s -> s.getApprovalStatus() != null && s.getApprovalStatus() == 2).collect(Collectors.toList()); BigDecimal stepSize = BigDecimal.valueOf(stepDOS.size()); @@ -131,6 +130,7 @@ stepOverSize = BigDecimal.valueOf(stepOver.size()); } BigDecimal divide = stepOverSize.divide(stepSize, 2, RoundingMode.HALF_UP); + sgDeviceDO.setStatus(divide.compareTo(new BigDecimal(1)) == 0?2:deList.get(0).getDeviceStatus()); sgDeviceDO.setProgress(divide.toString()); sgDeviceDO.setDeviceProgress(getBigDecimalPercent(divide)); sgDeviceDO.setStepDOList(stepDOS); -- Gitblit v1.9.3