From 92b2c64d622d76466730d2543d2b0a8357332e86 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 17:31:38 +0800
Subject: [PATCH] 湖北水库：施工：项目列表添加片区、审批详情添加机构名
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 94b8b06..cb19486 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
@@ -17,6 +17,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -159,6 +160,7 @@
for (SgReportUserDO sgReportUserDO : list) {
if (user.get("ID").equals(sgReportUserDO.getUserId())){
sgReportUserDO.setUserName(user.get("REAL_NAME").toString());
+ sgReportUserDO.setDeptName(user.get("DEPTNAME").toString());
}
}
}
@@ -175,10 +177,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void approval(ApprovalDTO approvalDTO) {
+ Integer isReject = approvalDTO.getIsReject();
+ Long userId = approvalDTO.getUserId();
Long id = approvalDTO.getId();
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
.eq(SgReportUserDO::getApprovalStatus, 0).orderByDesc(SgReportUserDO::getApprovalOrder).list();
- SgReportUserDO sgReportUserDO = list.stream().filter(s -> s.getUserId().equals(approvalDTO.getUserId())).findFirst().get();
+ //审批者
+ SgReportUserDO sgReportUserDO = new SgReportUserDO();
+ if (isReject==0){
+ list.stream().filter(s -> s.getUserId().equals(userId)).findFirst().get();
+ }
+ if (isReject==1){
+ sgReportUserDO.setUserId(userId);
+ }
Date date = new Date();
LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
LambdaUpdateChainWrapper<SgReportUserDO> userUpdate = new LambdaUpdateChainWrapper<>(sgReportUserMapper)
@@ -211,7 +222,7 @@
// .stream().distinct()
// .stream().filter(s->s.getApprovalOrder()!=0 && s.getApprovalOrder()<= sgReportUserDO.getApprovalOrder()).collect(Collectors.toList())
;
- userUpdate.set(SgReportUserDO::getApprovalStatus,2).update();
+ userUpdate.set(SgReportUserDO::getApprovalStatus,2).update();
for (SgReportUserDO reportUserDO : sgReportUserDOS) {
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
//更新为历史数据
@@ -327,13 +338,8 @@
@Override
public Map<String, Long> countListAll(ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(null, searchDTO);
- List<SgProgressReportVO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
- List<SgProgressReportVO> over = list.stream().filter(s -> s.getStatus() == 1||s.getStatus()==2).collect(Collectors.toList());
- List<SgProgressReportVO> reject = list.stream().filter(s -> s.getStatus() == 3).collect(Collectors.toList());
Map<String, Long> map = new HashMap<>();
- map.put("pending", (long) pending.size());
- map.put("over", (long) over.size());
- map.put("reject", (long) reject.size());
+ getStatusCountByList(list, map);
return map;
}
@@ -341,6 +347,11 @@
public Map<String, Long> statusCount(ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.statusCount(searchDTO);
Map<String, Long> map = new HashMap<>();
+ getStatusCountByList(list, map);
+ return map;
+ }
+
+ private void getStatusCountByList(List<SgProgressReportVO> list, Map<String, Long> map) {
List<SgProgressReportVO> pending = list.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());
List<SgProgressReportVO> progress = list.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
List<SgProgressReportVO> over = list.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());
@@ -352,7 +363,6 @@
map.put("over", (long) over.size());
map.put("reject", (long) reject.size());
map.put("draft", (long) draft.size());
- return map;
}
@Override
--
Gitblit v1.9.3