From edbce34b10afb09063d4da7d31c907704e99dc83 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Mon, 18 Nov 2024 15:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E9=80=9F=E4=BA=91=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcSdhsEventController.java     | 22 +++++++------------
 .../service/impl/DcSdhsEventServiceImpl.java  |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java
index c880f515..38c45b75 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java
@@ -161,7 +161,8 @@ public class DcSdhsEventController extends BaseController {
             if (exportKey != null && exportKey.size() > 0){
                 //交通事件
                 if (exportKey.contains("1") || exportKey.contains("2") || exportKey.contains("3")
-                        || exportKey.contains("4") || exportKey.contains("5")){
+                        || exportKey.contains("4") || exportKey.contains("5")
+                        || exportKey.contains("14") || exportKey.contains("15")){
                     PoiUtil.createHeading1(newDoc,"交通事件");
                     for (String trafficIncidentType : exportKey) {
                         if ("1".equals(trafficIncidentType)){
@@ -179,6 +180,12 @@ public class DcSdhsEventController extends BaseController {
                         } else if ("5".equals(trafficIncidentType)){
                             //交通管制情况统计
                             dcSdhsEventService.exportStationAnalysis(newDoc,dcSdhsEventQuery);
+                        } else if ("14".equals(trafficIncidentType)){
+                            //拥堵地点统计
+                            dcSdhsEventService.accidentCongestedLocationExport(newDoc,dcSdhsEventQuery);
+                        } else if ("15".equals(trafficIncidentType)){
+                            //路段平均拥堵时长
+                            dcSdhsEventService.accidentCongestedTimeExport(newDoc,dcSdhsEventQuery);
                         }
 
                     }
@@ -222,19 +229,6 @@ public class DcSdhsEventController extends BaseController {
 
                     }
                 }
-                if (exportKey.contains("14") || exportKey.contains("15")){
-                    PoiUtil.createHeading1(newDoc,"拥堵情况");
-                    for (String trafficIncidentType : exportKey) {
-                        if ("14".equals(trafficIncidentType)){
-                            //拥堵地点统计
-                            dcSdhsEventService.accidentCongestedLocationExport(newDoc,dcSdhsEventQuery);
-                        } else if ("15".equals(trafficIncidentType)){
-                            //路段平均拥堵时长
-                            dcSdhsEventService.accidentCongestedTimeExport(newDoc,dcSdhsEventQuery);
-                        }
-
-                    }
-                }
 
             }
 
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
index 7ae6d84f..6f153edb 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java
@@ -731,7 +731,7 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService {
     @Override
     public void accidentCongestedTimeExport(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery) {
         List<Map<String, Object>> maps = accidentCongestedTime(dcSdhsEventQuery);
-        String title="事故拥堵时长分布(单位:min)";
+        String title="拥堵事件处置统计";
         PoiUtil.createHeading2(doc, title);
 
         if (maps != null && maps.size() != UniversalEnum.ZERO.getNumber()){