From 7f3b30605ca7a30a0e5b5f4772e451a244db50f2 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Wed, 18 Sep 2024 17:35:23 +0800
Subject: [PATCH] 湖北水库：项目下拉列表过滤
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 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 73b2a93..ebf9695 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
@@ -238,8 +238,10 @@
SgDeviceDO sgDeviceDO = new SgDeviceDO();
if (gxDeviceId == 999){
deviceType = "sgzb";
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else if(gxDeviceId == 998){
deviceType = "sgys";
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else {
sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
deviceType = sgDeviceDO.getDeviceType();
@@ -256,7 +258,9 @@
// }
//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());
+ if (gxDeviceId != 998 && gxDeviceId != 999){
+ 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()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
@@ -295,7 +299,7 @@
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
}else {
sgProgressReportVO.setDeviceName("");}
- List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getId).list();
+ 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) {
@@ -310,6 +314,23 @@
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);
+
+ if(sgProgressReportVO.getControlUnit()!=null){
+ String controlUnit = sgProgressReportVO.getControlUnit();
+ List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
+ sgProgressReportVO.setUserIDs(users1);
+ }
+ String gxStepName = sgProgressReportVO.getGxStepName();
+ String countyCd = sgProgressReportVO.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
return sgProgressReportVO;
}
@@ -329,12 +350,15 @@
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("请完成工序角色配置！");
+ Long gxDeviceId = sgProgressReportDOS1.getGxDeviceId();
+ if (gxDeviceId != 998 && gxDeviceId != 999) {
+ 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)
@@ -363,13 +387,13 @@
updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
//工序审核完成后 进行项目和设备状态的判断
- cachedThreadPool.execute(new Runnable(){
- @Override
- public void run(){
+// cachedThreadPool.execute(new Runnable(){
+// @Override
+// public void run(){
setProgramAndDeviceStatus(proframId);
-
- }
- });
+//
+// }
+// });
Long projectID = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
setProgramProgress(projectID);
}
@@ -377,6 +401,7 @@
updateChainWrapper.set(SgProgressReportDO::getStatus,3);
updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
userUpdate.set(SgReportUserDO::getApprovalStatus,2);
+ userUpdate.set(SgReportUserDO::getUserId,userId);
if (isReject==1){
userUpdate.set(SgReportUserDO::getUserId,userId);
}
@@ -481,9 +506,14 @@
SgOperatingRateVO vo = deviceTypes.get(projectId.toString());
if (Objects.nonNull(vo)){
project.setSurfaceProgress(vo.getSurfaceProgress());
+ project.setSurfaceNum(vo.getSurfaceNum());
project.setVideoProgress(vo.getVideoProgress());
+ project.setVideoNum(vo.getVideoNum());
project.setTransProgress(vo.getTransProgress());
+ project.setTransNum(vo.getTransNum());
project.setSeepageProgress(vo.getSeepageProgress());
+ project.setSeepageNum(vo.getSeepageNum());
+ sgProjectInfoMapper.updateById(project);
}
}
}
@@ -501,6 +531,8 @@
if(!user.getRoleId().equals("1811657352658042882")){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
//searchDTO.setUserId(userId);
@@ -546,6 +578,8 @@
if(!user.getRoleId().equals("1811657352658042882")){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
@@ -627,6 +661,8 @@
//判断是不是县级建办 否的话就是监理单位下人员进行
if(!user.getRoleId().equals("1811657352658042882")){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
// if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
--
Gitblit v1.9.3