From cc873cace93a40068d6bb6130b601b6c3e845b42 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 17 Jun 2024 20:40:48 +0800
Subject: [PATCH] 湖北水库：施工：APP待办列表、数量统计
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 a8487f0..fad2468 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
@@ -18,10 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
@@ -72,10 +69,15 @@
Long gxStepId = sgProgressReportDO.getGxStepId();
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
+ LambdaQueryChainWrapper<SgProgressReportDO> wrapper = new LambdaQueryChainWrapper<>(sgProgressReportMapper)
+ .eq(SgProgressReportDO::getGxStepId, gxStepId).eq(SgProgressReportDO::getGxDeviceId,gxDeviceId);
+ if ( sgProgressReportMapper.selectOne(wrapper)!=null){
+ throw new ServiceException("此工序已存在审批！");
+ }
for (SgGxStepDO gxStepDO : list) {
if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
- LambdaQueryChainWrapper<SgProgressReportDO> wrapper = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId());
- SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper);
+ LambdaQueryChainWrapper<SgProgressReportDO> wrapper1 = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId());
+ SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
if (one != null && one.getStatus() != 3) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
}
@@ -160,7 +162,7 @@
updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
}
}else {
- updateChainWrapper.set(SgProgressReportDO::getStatus,0);
+ updateChainWrapper.set(SgProgressReportDO::getStatus,3);
List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
.orderByAsc(SgReportUserDO::getApprovalOrder).list()
// .stream().distinct()
@@ -239,6 +241,26 @@
public void updateReport(SgProgressReportDO sgProgressReportDO) {
sgProgressReportMapper.updateById(sgProgressReportDO);
}
+
+ @Override
+ public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
+ Long userId = AuthUtil.getUserId();
+ searchDTO.setUserId(userId);
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
+ return list;
+ }
+
+ @Override
+ public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
+ Long userId = AuthUtil.getUserId();
+ searchDTO.setUserId(userId);
+ Long pending = sgProgressReportMapper.countList(searchDTO);
+ Long over = sgProgressReportMapper.countList(searchDTO);
+ Map<String, Long> map = new HashMap<>();
+ map.put("pending",pending);
+ map.put("over",over);
+ return map;
+ }
}
--
Gitblit v1.9.3