diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java index 4817ecc..17bf9db 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java @@ -75,14 +75,15 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi } for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { Map emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList); - checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据有组织废气污染物超标时段小时均值报表中填报的数据"); + checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据有组织废气污染物超标时段小时均值报表中填报的数据",false); } return resultList; } private void checkExceededData(List dataList, List resultList, - SRaActionReportsAuditResult queryActionReportsAuditResult, Map emissionDataMap,String message) { + SRaActionReportsAuditResult queryActionReportsAuditResult, Map emissionDataMap, + String message,boolean isWater) { for (BStatTableZxbgGasEmission statTableZxbgGasEmission : dataList) { String pollutantName = statTableZxbgGasEmission.getPollutantName(); String exceededData = statTableZxbgGasEmission.getExceededData(); @@ -93,8 +94,13 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi if (new BigDecimal(exceededData).compareTo(multiply) != 0) { SRaActionReportsAuditResult sRaActionReportsAuditResult = new SRaActionReportsAuditResult(); sRaActionReportsAuditResult.setId(queryActionReportsAuditResult.getId()); - sRaActionReportsAuditResult.setOrganizedGasMonitoringData(message+"," + statTableZxbgGasEmission.getOutletCode() + - pollutantName + "超标数据数量应为" + multiply + ",企业填报数据为" + exceededData + "数据不符。"); + if (isWater) { + sRaActionReportsAuditResult.setWaterMonitoringData(message + "," + statTableZxbgGasEmission.getOutletCode() + + pollutantName + "超标数据数量应为" + multiply + ",企业填报数据为" + exceededData + "数据不符。"); + } else { + sRaActionReportsAuditResult.setOrganizedGasMonitoringData(message + "," + statTableZxbgGasEmission.getOutletCode() + + pollutantName + "超标数据数量应为" + multiply + ",企业填报数据为" + exceededData + "数据不符。"); + } resultList.add(sRaActionReportsAuditResult); } } @@ -136,7 +142,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi } SRaActionReportsAuditResult sRaActionReportsAuditResult = new SRaActionReportsAuditResult(); sRaActionReportsAuditResult.setId(queryActionReportsAuditResult.getId()); - sRaActionReportsAuditResult.setWaterPreventionFacilities(allMessage.toString()); + sRaActionReportsAuditResult.setOrganizedGasMonitoringData(allMessage.toString()); resultList.add(sRaActionReportsAuditResult); } } @@ -159,7 +165,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi } for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { Map emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList); - checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据废水污染物超标时段日均值报表中填报的数据"); + checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据废水污染物超标时段日均值报表中填报的数据",true); } return resultList; @@ -197,7 +203,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi } SRaActionReportsAuditResult sRaActionReportsAuditResult = new SRaActionReportsAuditResult(); sRaActionReportsAuditResult.setId(queryActionReportsAuditResult.getId()); - sRaActionReportsAuditResult.setWaterPreventionFacilities(allMessage.toString()); + sRaActionReportsAuditResult.setWaterMonitoringData(allMessage.toString()); resultList.add(sRaActionReportsAuditResult); } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/task/ExecuteReportController.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/task/ExecuteReportController.java index 7a145dd..451ae9c 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/task/ExecuteReportController.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/task/ExecuteReportController.java @@ -35,8 +35,8 @@ public class ExecuteReportController { @Autowired private AnomalyAnalysisService anomalyAnalysisService; - - private final ExhaustExceedingProcessService exhaustExceedingProcessService; + @Autowired + private ExhaustExceedingProcessService exhaustExceedingProcessService;