From 280536989d74b20a79b8fe7d1708c65f56630a15 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Mon, 18 Nov 2024 18:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/project/code/statistical/staticProgram.html     | 3 ++-
 .../code/service/impl/EnterpriseComplaintServiceImpl.java     | 2 +-
 .../zdxt/code/service/impl/StatisticalPaneServiceImpl.java    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
index 21deffa3..d92458f3 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
@@ -904,7 +904,8 @@
                     legend: {
                         y : '10%',
                         x : 'center',
-                        data:[params.year+'年一季度', params.year+'年二季度', params.year+'年三季度', params.year+'年四季度'],
+                        /*data:[params.year+'年一季度', params.year+'年二季度', params.year+'年三季度', params.year+'年四季度'],*/
+                        data:[params.year+'年1月',params.year+'年2月',params.year+'年3月',params.year+'年4月',params.year+'年5月',params.year+'年6月',params.year+'年7月',params.year+'年8月',params.year+'年9月',params.year+'年10月',params.year+'年11月',params.year+'年12月'],
                         itemWidth: 16,
                         itemHeight: 10,
                         itemGap: 30,
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
index 3aa10871..94488cce 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
@@ -182,8 +182,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
         enterpriseComplaint.setId(IdUtil.simpleUUID());
         //默认工单为已受理
         enterpriseComplaint.setStatus(0);
-        int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);
         complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint);
+        int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);
         List<String> proCodeList = new ArrayList<>();
         if (i > 0) {
             if(enterpriseComplaint.getEnforceType()  != 3 ){
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
index 468e187b..24313977 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
@@ -232,8 +232,8 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
         p2.setName("被投诉部门数量");
         p2.setTotal(btsbmNow.size());
         p2.setHuan(btsbmNow.size()-btsbmLast.size());
-        Map<String,Long> tsqyNowList=complaintStatisticsListNow.stream().collect(Collectors.groupingBy(ComplaintStatistics::getEnterpriseNumber,Collectors.counting()));
-        Map<String,Long> tsqyLastList=complaintStatisticsListLast.stream().collect(Collectors.groupingBy(ComplaintStatistics::getEnterpriseNumber,Collectors.counting()));
+        Map<String,Long> tsqyNowList=complaintStatisticsListNow.stream().filter(item->item.getEnterpriseNumber()!=null&&!"".equals(item.getEnterpriseNumber())).collect(Collectors.groupingBy(ComplaintStatistics::getEnterpriseNumber,Collectors.counting()));
+        Map<String,Long> tsqyLastList=complaintStatisticsListLast.stream().filter(item->item.getEnterpriseNumber()!=null&&!"".equals(item.getEnterpriseNumber())).collect(Collectors.groupingBy(ComplaintStatistics::getEnterpriseNumber,Collectors.counting()));
         StatisticsIndicatorPart p3=new StatisticsIndicatorPart();
         p3.setName("投诉企业数量");
         p3.setTotal(tsqyNowList.size());