From feb39b032f50cf5c3770a821652c132a15bcfef1 Mon Sep 17 00:00:00 2001
From: zhangk <zhangk@gisuni.com>
Date: Mon, 24 Jun 2024 18:57:12 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into develop_zk
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 160 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 134 insertions(+), 26 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 0c21022..5e8dae5 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
@@ -9,6 +9,8 @@
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.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;
@@ -66,10 +68,13 @@
@Override
@Transactional
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);
@@ -77,10 +82,12 @@
throw new ServiceException("此工序已存在审批！");
}
for (SgGxStepDO gxStepDO : list) {
- if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) {
- LambdaQueryChainWrapper<SgProgressReportDO> wrapper1 = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId());
+ 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() + "的审批！");
}
}
@@ -92,15 +99,25 @@
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("请完成工序角色配置！");
+ }
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())));
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);
@@ -122,7 +139,18 @@
@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).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());
+ }
+ }
+ }
sgProgressReportVO.setSgReportUserDOS(list);
List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
@@ -155,7 +183,7 @@
cachedThreadPool.execute(new Runnable(){
@Override
public void run(){
- setProgramAndDeviceStatus();
+ setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
}
});
@@ -182,9 +210,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());
@@ -197,9 +239,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<>();
@@ -215,23 +258,23 @@
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()) {
+ if (deviceFinishCount!=0 && deviceFinishCount == sgDeviceDOS.size()) {
//如果项目下的设备下全部完成
project.setStatus(2);
sgProjectInfoMapper.updateById(project);
@@ -260,13 +303,78 @@
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> 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;
+ }
+
+ @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