From 982dacdf60f9b6ccdc321e38857f15d9ac22ba43 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Mon, 22 Jul 2024 16:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E7=AB=99=E7=AE=A1=E5=88=B6?= =?UTF-8?q?=E5=88=86=E6=9E=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zc/business/controller/WordController.java | 2 +- .../main/resources/mapper/business/DcTrafficIncidentsMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/WordController.java b/zc-business/src/main/java/com/zc/business/controller/WordController.java index a82c0592..ee29ec1a 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WordController.java +++ b/zc-business/src/main/java/com/zc/business/controller/WordController.java @@ -1411,7 +1411,7 @@ public class WordController { infoTableWidth.setType(STTblWidth.DXA); infoTableWidth.setW(BigInteger.valueOf(UniversalEnum.NINE_THOUSAND_AND_SEVENTY_TWO.getNumber())); - setTableFonts(table.getRow(UniversalEnum.ZERO.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.TOTAL.getValue()); + setTableFonts(table.getRow(UniversalEnum.ZERO.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), "合计(分钟)"); setTableFonts(table.getRow(UniversalEnum.ONE.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), congestionDurationList.get(UniversalEnum.ZERO.getNumber()).get("minuteTime").toString()); } diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml index f4a499e4..0387ca60 100644 --- a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml @@ -226,7 +226,7 @@ UNION ALL select 5 control_cause,'' cause_type,'警备任务' controlCauseName,'' causeTypeName UNION ALL select 6 control_cause,'' cause_type,'其他' controlCauseName,'' causeTypeName) t3 LEFT JOIN - (select t2.control_type,t2.control_cause,t2.cause_type,count(*) num,sum( + (select t2.control_type,t2.control_cause,ifnull(t2.cause_type,'') cause_type,count(*) num,sum( case when date_format(#{startTime},'%Y-%m-%d %H:%i:%s') >= date_format(t1.start_time,'%Y-%m-%d %H:%i:%s') and (DATE_FORMAT(t1.end_time,'%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s') or ISNULL(t1.end_time)) then TIMESTAMPDIFF(MINUTE,t1.start_time,now())