From d6bb484bc64250c0df09533959ae8add8211abf5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 19:28:38 +0800
Subject: [PATCH] 湖北水库：施工：项目列表(查询所有项目)
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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 cb19486..61a4b5d 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
@@ -74,14 +74,16 @@
@Override
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
+ Long userId = AuthUtil.getUserId();
+ sgProgressReportDO.setReportUser(userId);
+ Date now = DateUtil.now();
+ sgProgressReportDO.setReportTime(now);
+ sgProgressReportDO.setCreateTime(now);
//如果为草稿状态，单纯插入
if(sgProgressReportDO.getStatus()==4){
sgProgressReportMapper.insert(sgProgressReportDO);
return;
}
- Date now = DateUtil.now();
- sgProgressReportDO.setReportTime(now);
- sgProgressReportDO.setCreateTime(now);
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
@@ -104,9 +106,7 @@
}
}
}
- Long userId = AuthUtil.getUserId();
sgProgressReportDO.setStatus(0);
- sgProgressReportDO.setReportUser(userId);
sgProgressReportMapper.insert(sgProgressReportDO);
SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
String deviceType = sgDeviceDO.getDeviceType();
@@ -180,16 +180,11 @@
Integer isReject = approvalDTO.getIsReject();
Long userId = approvalDTO.getUserId();
Long id = approvalDTO.getId();
+ SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
.eq(SgReportUserDO::getApprovalStatus, 0).orderByDesc(SgReportUserDO::getApprovalOrder).list();
//审批者
- SgReportUserDO sgReportUserDO = new SgReportUserDO();
- if (isReject==0){
- list.stream().filter(s -> s.getUserId().equals(userId)).findFirst().get();
- }
- if (isReject==1){
- sgReportUserDO.setUserId(userId);
- }
+ SgReportUserDO sgReportUserDO = list.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
Date date = new Date();
LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
LambdaUpdateChainWrapper<SgReportUserDO> userUpdate = new LambdaUpdateChainWrapper<>(sgReportUserMapper)
@@ -222,7 +217,11 @@
// .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);
+ if (isReject==1){
+ userUpdate.set(SgReportUserDO::getUserId,userId);
+ }
+ userUpdate.update();
for (SgReportUserDO reportUserDO : sgReportUserDOS) {
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
//更新为历史数据
--
Gitblit v1.9.3