From 188776066eb8d35cf789bed2c866bf351ca64f4a Mon Sep 17 00:00:00 2001 From: shenyijian <1178253012@qq.com> Date: Wed, 16 Oct 2024 18:43:58 +0800 Subject: [PATCH] 湖北水库：项目流程添加设备排序 --- skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 4 +++- 1 files changed, 3 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 22eb2ba..d48235a 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 @@ -220,6 +220,7 @@ SgDeviceDO sgDeviceDO = new SgDeviceDO(); sgDeviceDO.setId(dId); sgDeviceDO.setDeviceName(deList.get(0).getDeviceName()); + sgDeviceDO.setPrice(deList.get(0).getPrice()); List<SgGxStepDO> stepDOS = deList.stream().filter(s -> s.getReportStatus() == null || (s.getReportStatus() != 4 && !(s.getReportStatus() == 3 && s.getResubmit() != 0))).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()); @@ -239,7 +240,8 @@ double sum = deviceDOS.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum(); BigDecimal deviceOver = BigDecimal.valueOf(sum); BigDecimal divideDevice = deviceOver.divide(deviceSize, 2, RoundingMode.HALF_UP); - typeVO.setDeviceDOS(deviceDOS); + List<SgDeviceDO> sortDeviceDOs = deviceDOS.stream().sorted(Comparator.comparing(SgDeviceDO::getPrice)).collect(Collectors.toList()); + typeVO.setDeviceDOS(sortDeviceDOs); typeVO.setTypeProgress(getBigDecimalPercent(divideDevice)); typeVO.setProgress(divideDevice.toString()); sgGxDOS.add(typeVO); -- Gitblit v1.9.3