From 0559e5106c01471bcae3e1c54d337096ef4daad9 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:28 +0800
Subject: [PATCH] 湖北水库：施工：添加上报校验、审批详情排序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 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 4be3fdf..6b08402 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
@@ -10,6 +10,7 @@
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.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -69,10 +70,11 @@
public void add(SgProgressReportDO sgProgressReportDO) {
Date now = DateUtil.now();
sgProgressReportDO.setReportTime(now);
+ sgProgressReportDO.setCreateTime(now);
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
- List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId);
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
+ List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId);
List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
@@ -80,11 +82,12 @@
throw new ServiceException("此工序已存在审批！");
}
for (SgGxStepDO gxStepDO : list) {
- if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
+ if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) >= 1) {
QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
wrapper1.eq("gx_step_id", gxStepDO.getId());
+ wrapper1.eq("gx_device_id",gxDeviceId);
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
- if (one != null && one.getStatus() != 3) {
+ if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
}
}
@@ -131,7 +134,17 @@
@Override
public SgProgressReportVO detail(String id) {
SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
- List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getApprovalTime).list();
+ SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
+ sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
+ List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).list();
+ List<SgReportUserDO> reportUserDOS = new ArrayList<>();
+ Map<Integer, List<SgReportUserDO>> map = list.stream().collect(Collectors.groupingBy(SgReportUserDO::getIsHis));
+ List<SgReportUserDO> sgReportUserDOS = map.get(1);
+ if (CollectionUtils.isNotEmpty(sgReportUserDOS)){
+ List<SgReportUserDO> sortList = sgReportUserDOS.stream().sorted(Comparator.comparing(SgReportUserDO::getApprovalTime)).collect(Collectors.toList());
+ reportUserDOS.addAll(sortList);
+ }
+ reportUserDOS.addAll(map.get(0).stream().sorted(Comparator.comparingInt(SgReportUserDO::getApprovalOrder)).collect(Collectors.toList()));
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) {
@@ -141,7 +154,7 @@
}
}
}
- sgProgressReportVO.setSgReportUserDOS(list);
+ sgProgressReportVO.setSgReportUserDOS(reportUserDOS);
List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
return sgProgressReportVO;
@@ -233,20 +246,20 @@
List<SgDeviceGxStepDO> sgDeviceGxStepDOs = sgGxStepMapper.getDeviceGXList(sgDeviceDO.getId());
if (sgDeviceGxStepDOs != null) {
- int countStatus = 0;
- for (SgDeviceGxStepDO sgDeviceGxStepDO : sgDeviceGxStepDOs) {
- countStatus = +sgDeviceGxStepDO.getStatus();
-
- }
- int size = sgDeviceGxStepDOs.size();
- if (countStatus != 0 && (size * 2) / countStatus == 1) {
+// 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++;
- }
-
-
+ }
}
}
if (deviceFinishCount == sgDeviceDOS.size()) {
@@ -278,7 +291,9 @@
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
Long userId = AuthUtil.getUserId();
searchDTO.setUserId(userId);
+ searchDTO.setApprovalStatus(0);
Long pending = sgProgressReportMapper.countList(searchDTO);
+ searchDTO.setApprovalStatus(1);
Long over = sgProgressReportMapper.countList(searchDTO);
Map<String, Long> map = new HashMap<>();
map.put("pending",pending);
@@ -301,6 +316,53 @@
map.put("reject", (long) reject.size());
return map;
}
+
+ @Override
+ public boolean checkStep(Long gxDeviceId, Long gxStepId) {
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
+ List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
+ 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){
+ return false;
+ }
+ for (SgGxStepDO gxStepDO : list) {
+ if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) >= 1) {
+ QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("gx_step_id", gxStepDO.getId());
+ wrapper1.eq("gx_device_id", gxDeviceId);
+ SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
+ if (one == null || one.getStatus() != 2) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
+ Long userId = AuthUtil.getUserId();
+ searchDTO.setUserId(userId);
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
+ return page.setRecords(list);
+ }
+
+ @Override
+ public String getDeviceReport(Long gxDeviceId, Long gxStepId) {
+ QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
+ wrapper.eq("gx_device_id",gxDeviceId);
+ if (gxStepId!=null){
+ wrapper.eq("gx_step_id",gxStepId);
+ }
+ List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(wrapper);
+ if (CollectionUtils.isNotEmpty(sgProgressReportDOS)){
+ sgProgressReportDOS.sort((u1, u2) -> u2.getCreateTime().compareTo(u1.getCreateTime()));
+ return sgProgressReportDOS.get(0).getId().toString();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3