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 | 17 +++++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 19 ++++++---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 20 +++++++++
4 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
index 4ccf2d5..d812b28 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -155,4 +155,9 @@
*/
private String deptId;
+ /**
+ * 是否单位过滤 1不过滤
+ */
+ private Integer isUnit;
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 4107f18..9a26031 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -84,7 +84,7 @@
DBMS_LOB.SUBSTR(report.video_urls) videoUrls,
de.device_name,
de.device_type,
- userR.approval_status,
+ MAX(userR.approval_status) as approval_status,
dict."DICT_VALUE" as typeName,
si.control_unit,si.self_unit,dria."county_cd"
FROM
@@ -130,6 +130,24 @@
<if test="dto.endTime != null and dto.endTime !='' ">
and report.report_time <= #{dto.endTime}
</if>
+ group by
+ report.id,
+ report.program_name,
+ report.gx_step_name,
+ report."STATUS",
+ report.audit_person,
+ report.report_time,
+ report.create_time,
+ report.gx_progress,
+ report.remark,
+ DBMS_LOB.SUBSTR( report.images_urls) ,
+ DBMS_LOB.SUBSTR( report.video_urls ) ,
+ de.device_name,
+ de.device_type,
+ dict."DICT_VALUE" ,
+ si.control_unit,
+ si.self_unit,
+ dria."county_cd"
order by report.report_time desc
<!--<choose >
<when test="dto.approvalStatus != null and dto.approvalStatus == 0">
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 5379e04..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
@@ -387,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);
}
@@ -506,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);
}
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index 702ca96..b8bfbde 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -348,8 +348,11 @@
*/
private void setDeptId(ProjectSearchDTO searchDTO) {
String deptId = AuthUtil.getDeptId();
+ boolean b = Objects.nonNull(searchDTO.getIsUnit()) && searchDTO.getIsUnit() == 1;
if (!deptId.equals("420000000000")){
- searchDTO.setDeptId(deptId);
+ if (!b){
+ searchDTO.setDeptId(deptId);
+ }
}
}
@@ -471,7 +474,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setSeepageProgress("0");
+ sgOperatingRateVO.setSeepageProgress("0%");
}
}
//视频
@@ -484,7 +487,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setVideoProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setVideoProgress("0");
+ sgOperatingRateVO.setVideoProgress("0%");
}
}
//渗压
@@ -497,7 +500,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setTransProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setTransProgress("0");
+ sgOperatingRateVO.setTransProgress("0%");
}
}
//渗流
@@ -510,7 +513,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setSeepageProgress("0");
+ sgOperatingRateVO.setSeepageProgress("0%");
}
}
}
@@ -536,7 +539,11 @@
for (String id : ids) {
projectSearchDTO.setProjectId(id);
List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
- getProjectProgress(list).forEach(ss -> bigDecimals.add(ss.getProjectProgressNum()));
+ getProjectProgress(list).forEach(ss->{
+ if (Objects.nonNull(ss.getProjectProgressNum())){
+ bigDecimals.add(ss.getProjectProgressNum());
+ }
+ });
}
BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
--
Gitblit v1.9.3