From d1c97643c8ef372650b7426c468812dd06263100 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 18 Jun 2024 19:34:09 +0800
Subject: [PATCH] 湖北水库：施工：APP待办数量统计
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 95fb1c8..efbbe7d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -69,6 +69,7 @@
public void add(SgProgressReportDO sgProgressReportDO) {
Date now = DateUtil.now();
sgProgressReportDO.setReportTime(now);
+ sgProgressReportDO.setCreateTime(now);
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
@@ -84,7 +85,7 @@
QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
wrapper1.eq("gx_step_id", gxStepDO.getId());
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
- if (one != null && one.getStatus() != 2) {
+ if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
}
}
@@ -235,20 +236,20 @@
List<SgDeviceGxStepDO> sgDeviceGxStepDOs = sgGxStepMapper.getDeviceGXList(sgDeviceDO.getId());
if (sgDeviceGxStepDOs != null) {
- int countStatus = 0;
- for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
- countStatus = +sgDeviceGxStepDO.getStatus();
-
- }
- int size = sgDeviceGxStepDOs.size();
- if (countStatus != 0 && (size * 2) / countStatus == 1) {
+// int countStatus = 0;
+// for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
+// countStatus = +sgDeviceGxStepDO.getStatus();
+//
+// }
+// int size = sgDeviceGxStepDOs.size(); //4
+ boolean allStatusesAreTwo = sgDeviceGxStepDOs.stream()
+ .allMatch(s -> s.getStatus() == 2);
+ if (allStatusesAreTwo) {
//如果设备下全部工序审核完成
sgDeviceDO.setStatus(2);
sgDeviceMapper.updateById(sgDeviceDO);
deviceFinishCount++;
- }
-
-
+ }
}
}
if (deviceFinishCount == sgDeviceDOS.size()) {
@@ -280,7 +281,9 @@
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
Long userId = AuthUtil.getUserId();
searchDTO.setUserId(userId);
+ searchDTO.setApprovalStatus(0);
Long pending = sgProgressReportMapper.countList(searchDTO);
+ searchDTO.setApprovalStatus(1);
Long over = sgProgressReportMapper.countList(searchDTO);
Map<String, Long> map = new HashMap<>();
map.put("pending",pending);
--
Gitblit v1.9.3