From 9aed65a6aee6a4ec73bad2b34150a50285bc951b Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 28 Jun 2024 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 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 d7de5cf..e817bb1 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
@@ -183,43 +183,40 @@
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();
+ List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
+ .orderByAsc(SgReportUserDO::getApprovalOrder).list();
//审批者
- SgReportUserDO sgReportUserDO = list.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
+ SgReportUserDO sgReportUserDO = new SgReportUserDO();
+ if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
+ sgReportUserDO = sgReportUserDOS.get(0);
+ }else {
+ sgReportUserDO = sgReportUserDOS.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)
.eq(SgReportUserDO::getId, sgReportUserDO.getId()).set(SgReportUserDO::getApprovalContent,approvalDTO.getApprovalContent()).set(SgReportUserDO::getApprovalTime,date);
if (approvalDTO.getStatus()==1){
+ Integer approvalOrder = sgReportUserDO.getApprovalOrder();
userUpdate.set(SgReportUserDO::getApprovalStatus,1).update();
- if (sgReportUserDO.getId()==list.get(0).getId()){
- updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
-
-
- //工序审核完成后 进行项目和设备状态的判断
-
- cachedThreadPool.execute(new Runnable(){
- @Override
- public void run(){
- setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
- }
- });
-
-
-
- }else {
- SgReportUserDO nextUser = list.stream().filter(s -> s.getApprovalOrder()==sgReportUserDO.getApprovalOrder()+1).findFirst().get();
- updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
- }
+ Optional<SgReportUserDO> next = sgReportUserDOS.stream().filter(s -> s.getApprovalOrder() == approvalOrder + 1).findFirst();
+ //如果存在下一个审批人，则继续审批
+ if (next.isPresent()){
+ SgReportUserDO nextUser = next.get();
+ updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
+ }else {
+ updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
+ //工序审核完成后 进行项目和设备状态的判断
+ cachedThreadPool.execute(new Runnable(){
+ @Override
+ public void run(){
+ setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
+ }
+ });
+ }
}else {
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()
-// .stream().filter(s->s.getApprovalOrder()!=0 && s.getApprovalOrder()<= sgReportUserDO.getApprovalOrder()).collect(Collectors.toList())
- ;
- userUpdate.set(SgReportUserDO::getApprovalStatus,2);
+ userUpdate.set(SgReportUserDO::getApprovalStatus,2);
if (isReject==1){
userUpdate.set(SgReportUserDO::getUserId,userId);
}
@@ -228,10 +225,7 @@
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
//更新为历史数据
new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
- reportUserDO.setId(null);
- reportUserDO.setApprovalStatus(0);
- reportUserDO.setIsHis(0);
- reportUserDO.setApprovalTime(date);
+ setReportUser(date, reportUserDO);
sgReportUserMapper.insert(reportUserDO);
try {
Thread.sleep(100);
@@ -240,10 +234,7 @@
}
}else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
sgReportUserMapper.deleteById(reportUserDO.getId());
- reportUserDO.setId(null);
- reportUserDO.setApprovalStatus(0);
- reportUserDO.setIsHis(0);
- reportUserDO.setApprovalTime(date);
+ setReportUser(date, reportUserDO);
sgReportUserMapper.insert(reportUserDO);
try {
Thread.sleep(100);
@@ -261,6 +252,14 @@
}
+ private void setReportUser(Date date, SgReportUserDO reportUserDO) {
+ reportUserDO.setId(null);
+ reportUserDO.setApprovalStatus(0);
+ reportUserDO.setIsHis(0);
+ reportUserDO.setApprovalTime(date);
+ reportUserDO.setApprovalContent(null);
+ }
+
public void setProgramAndDeviceStatus(Long projectId){
//查询所有的项目
--
Gitblit v1.9.3