From f8c80586bfc419db594673b8ea0524a246d596ca Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 13 Sep 2024 21:44:02 +0800
Subject: [PATCH] 湖北水库：审核流修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 32 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 ff965e4..29f564b 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
@@ -3,10 +3,7 @@
import cn.gistack.sm.sg.DO.*;
import cn.gistack.sm.sg.DTO.ApprovalDTO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
-import cn.gistack.sm.sg.VO.SgProgressReportVO;
-import cn.gistack.sm.sg.VO.SgProjectInfoVO;
-import cn.gistack.sm.sg.VO.SgReportVO;
-import cn.gistack.sm.sg.VO.SgStepReportVO;
+import cn.gistack.sm.sg.VO.*;
import cn.gistack.sm.sg.mapper.*;
import cn.gistack.sm.sg.service.SgProgressReportService;
import cn.gistack.sm.sg.service.SgProjectInfoService;
@@ -66,20 +63,46 @@
@Autowired
private SgProjectInfoServiceImpl sgProjectInfoService;
+
+
ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
@Override
public IPage<SgProgressReportVO> queryPageList(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ Long proframId = s.getProframId();
+ SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
+ String controlUnit = sgProjectInfoDO.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ s.setUserIDs(users);
+ });
+
+ }
return page.setRecords(list);
}
@Override
public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ Long proframId = s.getProframId();
+ SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
+ String controlUnit = sgProjectInfoDO.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ s.setUserIDs(users);
+ });
+
+ }
return page.setRecords(list);
}
@Override
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
+ String resubmitId = sgProgressReportDO.getResubmitId();
+ if (StringUtils.isNotBlank(resubmitId)){
+ new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId,resubmitId).set(SgProgressReportDO::getResubmit,1).update();
+ }
Long userId = AuthUtil.getUserId();
sgProgressReportDO.setReportUser(userId);
Date now = DateUtil.now();
@@ -120,7 +143,7 @@
if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
- if (sgProgressReportDO1.getStatus()!= 2) {
+ if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) {
throw new ServiceException("请先完成施工准备的审批!");
}
}
@@ -132,13 +155,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,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) {
@@ -147,6 +180,7 @@
wrapper1.eq("gx_step_id", gxStepDO.getId());
wrapper1.eq("gx_device_id",gxDeviceId);
wrapper1.ne("status",4);
+ wrapper1.ne("status",3);
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
@@ -171,22 +205,23 @@
if (CollectionUtils.isEmpty(roIds)){
throw new ServiceException("请完成工序角色配置！");
}
- List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).eq(SgProjectPersonConfigDO::getProgramId,sgProgressReportDO.getProframId()).in(SgProjectPersonConfigDO::getRoldId, roIds).list();
- if (CollectionUtils.isEmpty(personConfigDOS)){
- throw new ServiceException("请完成项目审批人员配置！");
- }
- Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
- sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").approvalStatus(0).approvalOrder(0).approvalTime(now).build());
+// List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).eq(SgProjectPersonConfigDO::getProgramId,sgProgressReportDO.getProframId()).in(SgProjectPersonConfigDO::getRoldId, roIds).list();
+// if (CollectionUtils.isEmpty(personConfigDOS)){
+// throw new ServiceException("请完成项目审批人员配置！");
+// }
+ //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
+ //新增审批记录
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
- sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
- sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgGxConfigDO.getUser()).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
+ //sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
if (sgGxConfigDO.getSgOrder() == 1) {
- sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser()));
+ sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getRoleId()));
sgProgressReportMapper.updateById(sgProgressReportDO);
}
}
@@ -228,6 +263,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;
}
@@ -242,15 +278,29 @@
Integer isReject = approvalDTO.getIsReject();
Long userId = approvalDTO.getUserId();
Long id = approvalDTO.getId();
+ String roleId = AuthUtil.getUser().getRoleId();
+ QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
+ wrappers.eq("id", id);
+ SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers);
+
+ //判断当前用户的角色是不是 工序配置的审核的角色
+
+ List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
+ .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType()).eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
+ List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(roIds)){
+ throw new ServiceException("请完成工序角色配置！");
+ }
SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
.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();
+ sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getRoleId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
}
Date date = new Date();
LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
@@ -258,12 +308,12 @@
.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();
+ userUpdate.set(SgReportUserDO::getApprovalStatus,1).set(SgReportUserDO::getUserId,userId).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();
+ updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getRoleId()).update();
}else {
updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
@@ -275,21 +325,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){
@@ -327,12 +372,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) {
@@ -385,7 +432,14 @@
sgProjectInfoMapper.updateById(project);
}
}
-
+ Map<String, SgOperatingRateVO> deviceTypes = sgProjectInfoService.getDeviceTypes(Arrays.asList(projectId.toString()));
+ SgOperatingRateVO vo = deviceTypes.get(projectId.toString());
+ if (Objects.nonNull(vo)){
+ project.setSurfaceProgress(vo.getSurfaceProgress());
+ project.setVideoProgress(vo.getVideoProgress());
+ project.setTransProgress(vo.getTransProgress());
+ project.setSeepageProgress(vo.getSeepageProgress());
+ }
}
}
@@ -408,6 +462,7 @@
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
Long userId = AuthUtil.getUserId();
searchDTO.setUserId(userId);
+ searchDTO.setAuditPerson(userId.toString());
List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
searchDTO.setApprovalStatus(0);
List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
@@ -482,6 +537,9 @@
public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
Long userId = AuthUtil.getUserId();
searchDTO.setUserId(userId);
+ if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
+ searchDTO.setAuditPerson(String.valueOf(userId));
+ }
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
return page.setRecords(list);
}
--
Gitblit v1.9.3