From 0aa9af7bc8e34d539c990c5d714e24092a2d53e7 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 20 Sep 2024 17:35:24 +0800
Subject: [PATCH] 湖北水库：水库分页接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 72 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 38 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 17af6ef..83ef140 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
@@ -258,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());
@@ -297,14 +299,24 @@
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
}else {
sgProgressReportVO.setDeviceName("");}
- 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<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalOrder).list();
+ List<Long> ids = list.stream().map(SgReportUserDO::getUserId).collect(Collectors.toList());
+ List<Long> rids = list.stream().map(SgReportUserDO::getRoleId).collect(Collectors.toList());
List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
+ List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);
+
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());
+ }
+ }
+ }
+ for (Map<String, Object> r : roles) {
+ for (SgReportUserDO sgReportUserDO : list) {
+ if (r.get("ID").equals(sgReportUserDO.getRoleId())){
+ sgReportUserDO.setRoleName(r.get("ROLENAME").toString());
}
}
}
@@ -365,7 +377,8 @@
//审批者
SgReportUserDO sgReportUserDO = new SgReportUserDO();
if (isReject==1){
- sgReportUserDO = sgReportUserDOS.get(0);
+ sgReportUserDO = SgReportUserDO.builder().reportId(approvalDTO.getId()).approvalOrder(sgReportUserDOS.get(sgReportUserDOS.size() - 1).getApprovalOrder()+1).roleId(Long.valueOf(roleId)).build();
+ sgReportUserMapper.insert(sgReportUserDO);
}else {
sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getRoleId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
}
@@ -385,13 +398,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);
}
@@ -400,35 +413,7 @@
updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
userUpdate.set(SgReportUserDO::getApprovalStatus,2);
userUpdate.set(SgReportUserDO::getUserId,userId);
- if (isReject==1){
- userUpdate.set(SgReportUserDO::getUserId,userId);
- }
userUpdate.update();
- /*for (SgReportUserDO reportUserDO : sgReportUserDOS) {
- if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
- //更新为历史数据
- new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
- setReportUser(date, reportUserDO);
- sgReportUserMapper.insert(reportUserDO);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
- sgReportUserMapper.deleteById(reportUserDO.getId());
- setReportUser(date, 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());
- }
- }*/
updateChainWrapper.update();
}
@@ -504,9 +489,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);
}
}
}
@@ -524,6 +514,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);
@@ -569,6 +561,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()));
@@ -650,6 +644,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