From 0604f7e5d3f4a71d92068a677176704c9eb60232 Mon Sep 17 00:00:00 2001
From: Frank <515380148@qq.com>
Date: Sun, 13 Aug 2023 15:45:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=89=E7=BB=84=E7=BB=87=E5=BA=9F=E6=B0=94?=
 =?UTF-8?q?=E6=B1=A1=E6=9F=93=E7=89=A9=E6=8E=92=E6=94=BE=E6=B5=93=E5=BA=A6?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
 =?UTF-8?q?=202.=E5=BA=9F=E6=B0=B4=E6=B1=A1=E6=9F=93=E7=89=A9=E6=8E=92?=
 =?UTF-8?q?=E6=94=BE=E6=B5=93=E5=BA=A6=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8=203.=EF=BC=88=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=97=B6=E6=AE=B5=EF=BC=89=E8=B6=85=E6=A0=87?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specifications/month/ExhaustExceedingProcessImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 a821f1d..4817ecc 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,14 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
         }
         for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
             Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
-            checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap);
+            checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据有组织废气污染物超标时段小时均值报表中填报的数据");
         }
 
         return resultList;
     }
 
     private void checkExceededData(List<BStatTableZxbgGasEmission> dataList, List<SRaActionReportsAuditResult> resultList,
-                                   SRaActionReportsAuditResult queryActionReportsAuditResult, Map<String, BigDecimal> emissionDataMap) {
+                                   SRaActionReportsAuditResult queryActionReportsAuditResult, Map<String, BigDecimal> emissionDataMap,String message) {
         for (BStatTableZxbgGasEmission statTableZxbgGasEmission : dataList) {
             String pollutantName = statTableZxbgGasEmission.getPollutantName();
             String exceededData = statTableZxbgGasEmission.getExceededData();
@@ -93,7 +93,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
             if (new BigDecimal(exceededData).compareTo(multiply) != 0) {
                 SRaActionReportsAuditResult sRaActionReportsAuditResult = new SRaActionReportsAuditResult();
                 sRaActionReportsAuditResult.setId(queryActionReportsAuditResult.getId());
-                sRaActionReportsAuditResult.setOrganizedGasMonitoringData("根据有组织废气污染物超标时段小时均值报表中填报的数据，" + statTableZxbgGasEmission.getOutletCode() +
+                sRaActionReportsAuditResult.setOrganizedGasMonitoringData(message+"，" + statTableZxbgGasEmission.getOutletCode() +
                         pollutantName + "超标数据数量应为" + multiply + ",企业填报数据为" + exceededData + "数据不符。");
                 resultList.add(sRaActionReportsAuditResult);
             }
@@ -159,7 +159,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
         }
         for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
             Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
-            checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap);
+            checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据废水污染物超标时段日均值报表中填报的数据");
         }
 
         return resultList;