1、大屏优化工作

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';

src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java

@@ -62,6 +62,8 @@ public class DataVSupervisionNotifyController {
     @GetMapping("/getChangedRank")
     public Result<JSONObject> 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<RankVo> fxsjChangedRankList = negativeMapper.getChangedRateRank(beginTime, endTime, 3);

src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@@ -152,7 +152,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "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, " +

src/main/java/com/biutag/supervision/service/DataMailService.java

@@ -151,9 +151,6 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
             //12337信访
             re.setNumTotal(numTotal.toString());
 
-
-
-
             re.setTotal(total.toString());
         }
         return res;