From f7beae39603d6a1ea76da6b0b757906b2a2932cc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 28 Jun 2024 12:00:09 +0800
Subject: [PATCH] 湖北水库：施工：项目进度列表修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 150 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 130 insertions(+), 20 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 f4e98eb..d7de5cf 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
@@ -7,14 +7,17 @@
import cn.gistack.sm.sg.VO.SgStepReportVO;
import cn.gistack.sm.sg.mapper.*;
import cn.gistack.sm.sg.service.SgProgressReportService;
+import cn.hutool.http.useragent.UserAgentUtil;
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;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,40 +66,52 @@
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
return page.setRecords(list);
}
-
+ @Override
+ public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
+ return page.setRecords(list);
+ }
@Override
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
+ Long userId = AuthUtil.getUserId();
+ sgProgressReportDO.setReportUser(userId);
Date now = DateUtil.now();
sgProgressReportDO.setReportTime(now);
+ sgProgressReportDO.setCreateTime(now);
+ //如果为草稿状态，单纯插入
+ if(sgProgressReportDO.getStatus()==4){
+ sgProgressReportMapper.insert(sgProgressReportDO);
+ return;
+ }
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);
+ 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){
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);
+ wrapper1.ne("status",4);
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
}
}
}
- Long userId = AuthUtil.getUserId();
sgProgressReportDO.setStatus(0);
- sgProgressReportDO.setReportUser(userId);
sgProgressReportMapper.insert(sgProgressReportDO);
SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
String deviceType = sgDeviceDO.getDeviceType();
List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
- .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).list();
+ .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).orderByAsc(SgGxConfigDO::getSgOrder).list();
List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
if (CollectionUtils.isEmpty(roIds)){
throw new ServiceException("请完成工序角色配置！");
@@ -110,6 +125,11 @@
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());
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
if (sgGxConfigDO.getSgOrder() == 1) {
sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser()));
sgProgressReportMapper.updateById(sgProgressReportDO);
@@ -132,14 +152,17 @@
public SgProgressReportVO detail(String id) {
SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(sgProgressReportVO.getGxStepId());
+ sgProgressReportVO.setStepRemark(sgGxStepDO.getRemark());
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
- List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getApprovalTime).list();
+ List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getId).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());
+ sgReportUserDO.setDeptName(user.get("DEPTNAME").toString());
}
}
}
@@ -156,10 +179,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void approval(ApprovalDTO approvalDTO) {
+ Integer isReject = approvalDTO.getIsReject();
+ 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();
- SgReportUserDO sgReportUserDO = list.stream().filter(s -> s.getUserId().equals(approvalDTO.getUserId())).findFirst().get();
+ //审批者
+ SgReportUserDO sgReportUserDO = list.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)
@@ -175,7 +202,7 @@
cachedThreadPool.execute(new Runnable(){
@Override
public void run(){
- setProgramAndDeviceStatus();
+ setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
}
});
@@ -192,7 +219,11 @@
// .stream().distinct()
// .stream().filter(s->s.getApprovalOrder()!=0 && s.getApprovalOrder()<= sgReportUserDO.getApprovalOrder()).collect(Collectors.toList())
;
- userUpdate.set(SgReportUserDO::getApprovalStatus,2).update();
+ userUpdate.set(SgReportUserDO::getApprovalStatus,2);
+ if (isReject==1){
+ userUpdate.set(SgReportUserDO::getUserId,userId);
+ }
+ userUpdate.update();
for (SgReportUserDO reportUserDO : sgReportUserDOS) {
if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
//更新为历史数据
@@ -202,9 +233,23 @@
reportUserDO.setIsHis(0);
reportUserDO.setApprovalTime(date);
sgReportUserMapper.insert(reportUserDO);
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
+ sgReportUserMapper.deleteById(reportUserDO.getId());
+ reportUserDO.setId(null);
+ reportUserDO.setApprovalStatus(0);
+ reportUserDO.setIsHis(0);
reportUserDO.setApprovalTime(date);
- sgReportUserMapper.updateById(reportUserDO);
+ sgReportUserMapper.insert(reportUserDO);
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}
if (reportUserDO.getApprovalOrder()==1){
updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
@@ -217,9 +262,10 @@
}
- public void setProgramAndDeviceStatus(){
+ public void setProgramAndDeviceStatus(Long projectId){
//查询所有的项目
- List<SgProjectInfoDO> sgProjectInfoDOS = sgProjectInfoMapper.selectList(null);
+ SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(projectId);
+ List<SgProjectInfoDO> sgProjectInfoDOS = List.of(sgProjectInfoDO);
if(sgProjectInfoDOS!=null&& !sgProjectInfoDOS.isEmpty()) {
for (SgProjectInfoDO project : sgProjectInfoDOS) {
QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
@@ -251,7 +297,7 @@
}
}
}
- if (deviceFinishCount == sgDeviceDOS.size()) {
+ if (deviceFinishCount!=0 && deviceFinishCount == sgDeviceDOS.size()) {
//如果项目下的设备下全部完成
project.setStatus(2);
sgProjectInfoMapper.updateById(project);
@@ -280,11 +326,21 @@
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
Long userId = AuthUtil.getUserId();
searchDTO.setUserId(userId);
- Long pending = sgProgressReportMapper.countList(searchDTO);
- Long over = sgProgressReportMapper.countList(searchDTO);
+ searchDTO.setApprovalStatus(0);
+ List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
+ searchDTO.setApprovalStatus(1);
+ List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
Map<String, Long> map = new HashMap<>();
- map.put("pending",pending);
- map.put("over",over);
+ map.put("pending", Long.valueOf(pending.size()));
+ map.put("over",Long.valueOf(over.size()));
+ return map;
+ }
+
+ @Override
+ public Map<String, Long> countListAll(ProjectSearchDTO searchDTO) {
+ List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(null, searchDTO);
+ Map<String, Long> map = new HashMap<>();
+ getStatusCountByList(list, map);
return map;
}
@@ -292,16 +348,70 @@
public Map<String, Long> statusCount(ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.statusCount(searchDTO);
Map<String, Long> map = new HashMap<>();
+ getStatusCountByList(list, map);
+ return map;
+ }
+
+ private void getStatusCountByList(List<SgProgressReportVO> list, Map<String, Long> map) {
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());
+ List<SgProgressReportVO> draft = list.stream().filter(s -> s.getStatus() == 4).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;
+ map.put("draft", (long) draft.size());
+ }
+
+ @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).ne("status",4);
+ 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);
+ wrapper1.ne("status",4);
+ 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).ne("status",4);
+ 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