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; } 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"> 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); } } } 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);
