From c937fbd715c8005826b520ef283aa9dc946728ff Mon Sep 17 00:00:00 2001 From: pengwei Date: Thu, 10 Jul 2025 10:49:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A4=A7=E5=B1=8F=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20250710.sql | 27 +++++++++++++++++++ .../DataVSupervisionNotifyController.java | 2 ++ .../supervision/mapper/NegativeMapper.java | 2 +- .../supervision/service/DataMailService.java | 3 --- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 sql/20250710.sql diff --git a/sql/20250710.sql b/sql/20250710.sql new file mode 100644 index 0000000..791c4b6 --- /dev/null +++ b/sql/20250710.sql @@ -0,0 +1,27 @@ +-- negative.supervise_report definition + +CREATE TABLE `supervise_report` ( + `id` varchar(40) COLLATE utf8mb4_general_ci NOT NULL, + `report_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '督察报告名称', + `crt_time` datetime DEFAULT NULL COMMENT '创建时间', + `crt_depart` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建单位', + `crt_depart_id` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建单位ID', + `crt_user` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `crt_emp_no` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人警号', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='督察通知'; + + +-- negative.supervise_report_file definition + +CREATE TABLE `supervise_report_file` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `file_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '文件名', + `file_path` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '文件名', + `supervise_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '督察报告ID', + `crt_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `del` tinyint DEFAULT '0' COMMENT '逻辑删除键0-未删1已删', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='督察通知文件'; + +ALTER TABLE negative ADD COLUMN report_id VARCHAR(255) COMMENT '督察报告id'; diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java index bd90c18..53c3b12 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java @@ -62,6 +62,8 @@ public class DataVSupervisionNotifyController { @GetMapping("/getChangedRank") public Result getChangedRank(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + + endTime= DateUtil.endOfDay(endTime); DayTimeSuperviseVo fxsjRankOverview = negativeMapper.getSupervisionRank(beginTime, endTime, 3); DayTimeSuperviseVo jsdwRankOverview = negativeMapper.getSupervisionRank(beginTime, endTime, 4); List fxsjChangedRankList = negativeMapper.getChangedRateRank(beginTime, endTime, 3); diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index c39bc2f..af06e94 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -152,7 +152,7 @@ public interface NegativeMapper extends BaseMapper { "sd.short_name AS label, " + "sd.id AS departId, " + "COUNT(DISTINCT ng.id) AS denominator, " + - "COUNT( DISTINCT IF(ng.isRectifyCode = 1, ng.id, NULL) ) AS numerator, " + + "COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) ) AS numerator, " + " COUNT(DISTINCT IF(ng.crt_depart_level = 0, ng.id, null)) as cityNumber, "+ " COUNT(DISTINCT IF(ng.crt_depart_level = 2, ng.id, null)) as countyNumber, "+ "ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1) AS rate, " + diff --git a/src/main/java/com/biutag/supervision/service/DataMailService.java b/src/main/java/com/biutag/supervision/service/DataMailService.java index c576d0a..aeb322b 100644 --- a/src/main/java/com/biutag/supervision/service/DataMailService.java +++ b/src/main/java/com/biutag/supervision/service/DataMailService.java @@ -151,9 +151,6 @@ public class DataMailService extends ServiceImpl