From 53e8b3ad59b48abf57321fd77c1924f4fe837b60 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 18 Jun 2024 18:28:13 +0800
Subject: [PATCH] 湖北水库：施工：设备所有审批通过状态通过
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 147 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 108 insertions(+), 39 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 f801c2f..f4e98eb 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
@@ -4,10 +4,12 @@
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.SgStepReportVO;
import cn.gistack.sm.sg.mapper.*;
import cn.gistack.sm.sg.service.SgProgressReportService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,10 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
@@ -68,15 +67,24 @@
@Override
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
+ Date now = DateUtil.now();
+ sgProgressReportDO.setReportTime(now);
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
+ QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
+ wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId);
+ List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
+ if ( sgProgressReportDOS!=null && sgProgressReportDOS.size()>0){
+ throw new ServiceException("此工序已存在审批！");
+ }
for (SgGxStepDO gxStepDO : list) {
if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
- LambdaQueryChainWrapper<SgProgressReportDO> wrapper = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId());
- SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper);
- if (one != null && one.getStatus() != 3) {
+ QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("gx_step_id", gxStepDO.getId());
+ SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
+ if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
}
}
@@ -90,9 +98,14 @@
List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
.eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).list();
List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
- List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).in(SgProjectPersonConfigDO::getRoldId, roIds).list();
+ 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));
- Date now = DateUtil.now();
sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").approvalStatus(0).approvalOrder(0).approvalTime(now).build());
for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
@@ -118,8 +131,21 @@
@Override
public SgProgressReportVO detail(String id) {
SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
+ SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
+ sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getApprovalTime).list();
+ List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
+ List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
+ for (Map<String, Object> user : users) {
+ for (SgReportUserDO sgReportUserDO : list) {
+ if (user.get("ID").equals(sgReportUserDO.getUserId())){
+ sgReportUserDO.setUserName(user.get("REAL_NAME").toString());
+ }
+ }
+ }
sgProgressReportVO.setSgReportUserDOS(list);
+ List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
+ sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
return sgProgressReportVO;
}
@@ -160,7 +186,7 @@
updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
}
}else {
- updateChainWrapper.set(SgProgressReportDO::getStatus,0);
+ 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()
@@ -194,45 +220,88 @@
public void setProgramAndDeviceStatus(){
//查询所有的项目
List<SgProjectInfoDO> sgProjectInfoDOS = sgProjectInfoMapper.selectList(null);
+ if(sgProjectInfoDOS!=null&& !sgProjectInfoDOS.isEmpty()) {
+ for (SgProjectInfoDO project : sgProjectInfoDOS) {
+ QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("program_id", project.getId());
+ //所有设备
+ List<SgDeviceDO> sgDeviceDOS = sgDeviceMapper.selectList(queryWrapper);
+ //项目下完成的设备数
+ int deviceFinishCount = 0;
+ if(!sgProjectInfoDOS.isEmpty()) {
+ for (SgDeviceDO sgDeviceDO : sgDeviceDOS) {
- for (SgProjectInfoDO project: sgProjectInfoDOS){
- QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("program_id",project.getId());
- //所有设备
- List<SgDeviceDO> sgDeviceDOS = sgDeviceMapper.selectList(queryWrapper);
- //项目下完成的设备数
- int deviceFinishCount=0;
- for (SgDeviceDO sgDeviceDO: sgDeviceDOS){
+ //设备的工序
+ List<SgDeviceGxStepDO> sgDeviceGxStepDOs = sgGxStepMapper.getDeviceGXList(sgDeviceDO.getId());
- //设备的工序
- List<SgDeviceGxStepDO> sgDeviceGxStepDOs = sgGxStepMapper.getDeviceGXList(sgDeviceDO.getId());
-
- if(sgDeviceGxStepDOs!=null){
- int countStatus=0;
- for (SgDeviceGxStepDO sgDeviceGxStepDO: sgDeviceGxStepDOs){
- countStatus=+sgDeviceGxStepDO.getStatus();
-
+ if (sgDeviceGxStepDOs != null) {
+// int countStatus = 0;
+// for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
+// countStatus = +sgDeviceGxStepDO.getStatus();
+//
+// }
+// int size = sgDeviceGxStepDOs.size(); //4
+ boolean allStatusesAreTwo = sgDeviceGxStepDOs.stream()
+ .allMatch(s -> s.getStatus() == 2);
+ if (allStatusesAreTwo) {
+ //如果设备下全部工序审核完成
+ sgDeviceDO.setStatus(2);
+ sgDeviceMapper.updateById(sgDeviceDO);
+ deviceFinishCount++;
+ }
+ }
}
- int size = sgDeviceGxStepDOs.size();
- if(countStatus!=0&&(size*2)/countStatus==1){
- //如果设备下全部工序审核完成
- sgDeviceDO.setStatus(2);
- sgDeviceMapper.updateById(sgDeviceDO);
- deviceFinishCount++;
+ if (deviceFinishCount == sgDeviceDOS.size()) {
+ //如果项目下的设备下全部完成
+ project.setStatus(2);
+ sgProjectInfoMapper.updateById(project);
}
-
-
}
- }
- if(deviceFinishCount==sgDeviceDOS.size()){
- //如果项目下的设备下全部完成
- project.setStatus(2);
- sgProjectInfoMapper.updateById(project);
}
}
+ }
+ @Override
+ public void updateReport(SgProgressReportDO sgProgressReportDO) {
+ sgProgressReportMapper.updateById(sgProgressReportDO);
+ }
+
+ @Override
+ public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
+ Long userId = AuthUtil.getUserId();
+ searchDTO.setUserId(userId);
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
+ return list;
+ }
+
+ @Override
+ public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
+ Long userId = AuthUtil.getUserId();
+ searchDTO.setUserId(userId);
+ Long pending = sgProgressReportMapper.countList(searchDTO);
+ Long over = sgProgressReportMapper.countList(searchDTO);
+ Map<String, Long> map = new HashMap<>();
+ map.put("pending",pending);
+ map.put("over",over);
+ return map;
+ }
+
+ @Override
+ public Map<String, Long> statusCount(ProjectSearchDTO searchDTO) {
+ List<SgProgressReportVO> list = sgProgressReportMapper.statusCount(searchDTO);
+ Map<String, Long> map = new HashMap<>();
+ 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());
+ List<SgProgressReportVO> reject = list.stream().filter(s -> s.getStatus() == 3).collect(Collectors.toList());
+ map.put("all", (long) list.size());
+ map.put("pending", (long) pending.size());
+ map.put("progress", (long) progress.size());
+ map.put("over", (long) over.size());
+ map.put("reject", (long) reject.size());
+ return map;
}
}
--
Gitblit v1.9.3