From 9c00c5de75be77dfeb314a6fea96455af7cbf53e Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 10 Sep 2024 21:19:23 +0800
Subject: [PATCH] 湖北水库：审批修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 e59e6ac..2265c96 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
@@ -136,14 +136,23 @@
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
- wrapper.in("status",Arrays.asList(0,1,2));
+ wrapper.in("status",Arrays.asList(0,1,2,3));
if(sgProgressReportDO.getGxDeviceId()==998 || sgProgressReportDO.getGxDeviceId()==999){
wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
}else {
wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4);
}
List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
- if ( sgProgressReportDOS!=null && sgProgressReportDOS.size()>0){
+
+ if (CollectionUtils.isNotEmpty(sgProgressReportDOS)){
+ for (SgProgressReportDO reportDO : sgProgressReportDOS) {
+ if (reportDO.getStatus()==3 && reportDO.getResubmit()!=null && reportDO.getResubmit()==0){
+ throw new ServiceException("此工序已存在审批！");
+ }
+ }
+ }
+ List<SgProgressReportDO> reportDOS = sgProgressReportDOS.stream().filter(s -> s.getStatus() != 3).collect(Collectors.toList());
+ if ( reportDOS!=null && reportDOS.size()>0){
throw new ServiceException("此工序已存在审批！");
}
for (SgGxStepDO gxStepDO : list) {
@@ -234,6 +243,7 @@
}
sgProgressReportVO.setSgReportUserDOS(list);
List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
+ sgStepReportVOS = sgStepReportVOS.stream().filter(s -> s.getApprovalStatus() == null || (s.getApprovalStatus() != 4 && !(s.getApprovalStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
return sgProgressReportVO;
}
@@ -253,7 +263,7 @@
.orderByAsc(SgReportUserDO::getApprovalOrder).list();
//审批者
SgReportUserDO sgReportUserDO = new SgReportUserDO();
- if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
+ if (isReject==1){
sgReportUserDO = sgReportUserDOS.get(0);
}else {
sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
@@ -281,21 +291,16 @@
}
});
- cachedThreadPool.execute(new Runnable(){
- @Override
- public void run(){
- Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
- setProgramProgress(proframId);
- }
- });
+ Long projectID = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
+ setProgramProgress(projectID);
}
}else {
updateChainWrapper.set(SgProgressReportDO::getStatus,3);
updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
userUpdate.set(SgReportUserDO::getApprovalStatus,2);
- /*if (isReject==1){
+ if (isReject==1){
userUpdate.set(SgReportUserDO::getUserId,userId);
- }*/
+ }
userUpdate.update();
/*for (SgReportUserDO reportUserDO : sgReportUserDOS) {
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
@@ -333,12 +338,14 @@
* @param proframId
*/
public void setProgramProgress(Long proframId) {
- SgProjectInfoVO sgProjectInfoVO = sgProjectInfoMapper.selectVOById(proframId);
- List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(Collections.singletonList(sgProjectInfoVO));
+ ProjectSearchDTO searchDTO = new ProjectSearchDTO();
+ searchDTO.setProjectId(String.valueOf(proframId));
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(searchDTO);
+ List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(list);
String projectProgress = progress.get(0).getProjectProgress();
if (StringUtils.isNotBlank(projectProgress)){
String s = projectProgress.substring(0, projectProgress.length() - 1);
- new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).update() ;
+ new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).eq(SgProjectInfoDO::getId,proframId).update() ;
}
}
private void setReportUser(Date date, SgReportUserDO reportUserDO) {
--
Gitblit v1.9.3