From 950eaddb98f55c10a5233ba917b25977c225787a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?= =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com> Date: Thu, 5 Dec 2024 14:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=B6=8B=E5=8A=BF=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datav/DataMailViewController.java | 7 +- .../mapper/DataPetition12337Mapper.java | 2 + .../mapper/DataPetitionComplaintMapper.java | 3 + .../supervision/mapper/NegativeMapper.java | 8 +- .../supervision/service/DataMailService.java | 90 +++++++++---------- src/main/resources/mapper/NegativeMapper.xml | 66 +++++++------- 6 files changed, 87 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java b/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java index cfac05d..8820d2a 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java @@ -77,7 +77,10 @@ public class DataMailViewController { public Result getAllMailCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { // 信访数据总数概览 - MailOverviewVo overview = dataMailService.getAllMailCount(beginTime, endTime); + JSONObject overview = dataMailService.allMailCount(beginTime, endTime); + System.out.println("信访总览================================"); + System.out.println(overview); +// MailOverviewVo overview = dataMailService.getAllMailCount(beginTime, endTime); JSONObject data = new JSONObject().fluentPut("overview", overview); return Result.success(data); } @@ -89,7 +92,7 @@ public class DataMailViewController { List countryList = dataMailService.getMailTrend(year, 21); // 国家 List policeList = dataMailService.getMailTrend(year, 22); // 公安部信访 List manageList = dataMailService.getMailTrend(year, 23); // 局长信箱 - List numberList = dataMailService.getMailTrend(year, 24); // 12337信访 + List numberList = dataMailService.getMailTrend12337(year); // 12337信访 JSONObject data = new JSONObject().fluentPut("countryList", countryList) .fluentPut("policeList", policeList) .fluentPut("manageList", manageList) diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java index ed46983..5c92aa0 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java @@ -2,6 +2,7 @@ package com.biutag.supervision.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.biutag.supervision.pojo.entity.DataPetition12337; +import com.biutag.supervision.pojo.vo.EchartsVo; import com.biutag.supervision.pojo.vo.RecentMailTrendByMonthVo; import org.apache.ibatis.annotations.Select; @@ -23,6 +24,7 @@ public interface DataPetition12337Mapper extends BaseMapper { " ORDER BY monthTime asc;") List selectRecentlyMailTrendByMonth12337(String year); + List getMailTrend12337(Integer year); } diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java index c9c24cd..ed948bb 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java @@ -152,4 +152,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper getMassMailRank(Date beginTime, Date endTime, int groupId); + + + } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index c9f25aa..fdb02b4 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -322,10 +322,10 @@ public interface NegativeMapper extends BaseMapper { List getConfinementAndPause(Date beginTime, Date endTime, Integer type); @Select("SELECT count(DISTINCT ng.id) AS totalMail, " + - "COUNT(DISTINCT ng.problemSourcesCode=21 ) AS countryMail, " + - "COUNT(DISTINCT ng.problemSourcesCode=22 ) AS policeMail, " + - "COUNT(DISTINCT ng.problemSourcesCode=24 ) AS numberMail, " + - "COUNT(DISTINCT ng.problemSourcesCode=23 ) AS manageMail " + + "COUNT( ng.problemSourcesCode=21 ) AS countryMail, " + + "COUNT( ng.problemSourcesCode=22 ) AS policeMail, " + + "COUNT( ng.problemSourcesCode=24 ) AS numberMail, " + + "COUNT( ng.problemSourcesCode=23 ) AS manageMail " + "FROM negative ng WHERE ng.checkStatus <> 3 " + "AND ng.discoveryTime BETWEEN #{beginTime} AND #{endTime} " + "AND ng.problemSourcesCode in(21, 22, 23, 24)") diff --git a/src/main/java/com/biutag/supervision/service/DataMailService.java b/src/main/java/com/biutag/supervision/service/DataMailService.java index 1fadb58..bf47793 100644 --- a/src/main/java/com/biutag/supervision/service/DataMailService.java +++ b/src/main/java/com/biutag/supervision/service/DataMailService.java @@ -137,70 +137,61 @@ public class DataMailService extends ServiceImpl policeQueryWrapper = new QueryWrapper<>(); policeQueryWrapper.eq("problem_sources_code", 22); policeQueryWrapper.between("discovery_time", beginTime, endTime); Long policeMail = dataPetitionComplaintMapper.selectCount(policeQueryWrapper); + System.out.println("公安部信访数量:" + policeMail); // 12337信访 QueryWrapper queryWrapper12337 = new QueryWrapper<>(); - Long total12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); - // 初访 - QueryWrapper firstQueryWrapper = new QueryWrapper<>(); - firstQueryWrapper.eq("initial_petition", 1); - firstQueryWrapper.between("discovery_time", beginTime, endTime); - Long firstMail = dataPetitionComplaintMapper.selectCount(firstQueryWrapper); - // 重访 - QueryWrapper secondQueryWrapper = new QueryWrapper<>(); - secondQueryWrapper.eq("initial_petition", 2); - secondQueryWrapper.between("discovery_time", beginTime, endTime); - Long secondMail = dataPetitionComplaintMapper.selectCount(secondQueryWrapper); - // 领导接访 - QueryWrapper leaderQueryWrapper = new QueryWrapper<>(); - leaderQueryWrapper.isNotNull("receiving_leader_name"); - leaderQueryWrapper.between("discovery_time", beginTime, endTime); - Long leaderReceiveMail = dataPetitionComplaintMapper.selectCount(leaderQueryWrapper); - // 领导督办 - QueryWrapper leaderViewQueryWrapper = new QueryWrapper<>(); - leaderViewQueryWrapper.isNotNull("receiving_leader_name"); - leaderViewQueryWrapper.between("discovery_time", beginTime, endTime); - Long leaderViewMail = dataPetitionComplaintMapper.selectCount(leaderViewQueryWrapper); - // 闹访 1：闹 0：不闹 - QueryWrapper tangleQueryWrapper = new QueryWrapper<>(); - tangleQueryWrapper.eq("entanglement_visits", 1); - tangleQueryWrapper.between("discovery_time", beginTime, endTime); - Long tangleMail = dataPetitionComplaintMapper.selectCount(tangleQueryWrapper); - // 集访 1：集 0：不集 - QueryWrapper massQueryWrapper = new QueryWrapper<>(); - massQueryWrapper.eq("mass_visits", 1); - massQueryWrapper.between("discovery_time", beginTime, endTime); - Long massMail = dataPetitionComplaintMapper.selectCount(massQueryWrapper); + Long numberMail = dataPetition12337Mapper.selectCount(queryWrapper12337); + System.out.println("12337信访数量:" + numberMail); +// // 初访 +// QueryWrapper firstQueryWrapper = new QueryWrapper<>(); +// firstQueryWrapper.eq("initial_petition", 1); +// firstQueryWrapper.between("discovery_time", beginTime, endTime); +// Long firstMail = dataPetitionComplaintMapper.selectCount(firstQueryWrapper); +// // 重访 +// QueryWrapper secondQueryWrapper = new QueryWrapper<>(); +// secondQueryWrapper.eq("initial_petition", 2); +// secondQueryWrapper.between("discovery_time", beginTime, endTime); +// Long secondMail = dataPetitionComplaintMapper.selectCount(secondQueryWrapper); +// // 领导接访 +// QueryWrapper leaderQueryWrapper = new QueryWrapper<>(); +// leaderQueryWrapper.isNotNull("receiving_leader_name"); +// leaderQueryWrapper.between("discovery_time", beginTime, endTime); +// Long leaderReceiveMail = dataPetitionComplaintMapper.selectCount(leaderQueryWrapper); +// // 领导督办 +// QueryWrapper leaderViewQueryWrapper = new QueryWrapper<>(); +// leaderViewQueryWrapper.isNotNull("receiving_leader_name"); +// leaderViewQueryWrapper.between("discovery_time", beginTime, endTime); +// Long leaderViewMail = dataPetitionComplaintMapper.selectCount(leaderViewQueryWrapper); +// // 闹访 1：闹 0：不闹 +// QueryWrapper tangleQueryWrapper = new QueryWrapper<>(); +// tangleQueryWrapper.eq("entanglement_visits", 1); +// tangleQueryWrapper.between("discovery_time", beginTime, endTime); +// Long tangleMail = dataPetitionComplaintMapper.selectCount(tangleQueryWrapper); +// // 集访 1：集 0：不集 +// QueryWrapper massQueryWrapper = new QueryWrapper<>(); +// massQueryWrapper.eq("mass_visits", 1); +// massQueryWrapper.between("discovery_time", beginTime, endTime); +// Long massMail = dataPetitionComplaintMapper.selectCount(massQueryWrapper); // 总数 - long totalMail = countryMail+policeMail+total12337; + long totalMail = countryMail+policeMail+numberMail; JSONObject overview = new JSONObject() // 信访总数（起） - .fluentPut("total", totalMail) + .fluentPut("totalMail", totalMail) // 国家信访 .fluentPut("countryMail", countryMail) // 公安部信访 .fluentPut("policeMail", policeMail) // 局长信箱 - .fluentPut("commissionerMail", 5534) + .fluentPut("manageMail", 5812) // 12337信访 - .fluentPut("numMail", total12337) - // 初访; - .fluentPut("firstMail", firstMail) - // 重访 - .fluentPut("secondMail", secondMail) - // 领导接访 - .fluentPut("leaderReceiveMail", leaderReceiveMail) - // 领导督办 - .fluentPut("leaderViewMail", leaderViewMail) - // 闹访问 - .fluentPut("tangleMail", tangleMail) - // 集访 - .fluentPut("massMail", massMail); + .fluentPut("numberMail", numberMail); return overview; } @@ -282,4 +273,9 @@ public class DataMailService extends ServiceImpl res = dataPetitionComplaintMapper.getMassMailRank(beginTime, endTime, groupId); return res; } + + public List getMailTrend12337(Integer year) { + List res = dataPetition12337Mapper.getMailTrend12337(year); + return res; + } } diff --git a/src/main/resources/mapper/NegativeMapper.xml b/src/main/resources/mapper/NegativeMapper.xml index 5862a41..b43d165 100644 --- a/src/main/resources/mapper/NegativeMapper.xml +++ b/src/main/resources/mapper/NegativeMapper.xml @@ -18,10 +18,10 @@ SELECT '10', '10月' UNION ALL SELECT '11', '11月' UNION ALL SELECT '12', '12月' ) m LEFT JOIN negative ng - ON DATE_FORMAT(ng.discoveryTime, '%m') = m.month - AND YEAR(ng.discoveryTime) = #{time} - AND ng.checkStatus != 3 - AND ng.problemSourcesCode IN (13, 15) + ON DATE_FORMAT(ng.discoveryTime, '%m') = m.month + AND YEAR(ng.discoveryTime) = #{time} + AND ng.checkStatus != 3 + AND ng.problemSourcesCode IN (13, 15) GROUP BY m.monthName ORDER BY m.month ASC; @@ -109,38 +109,32 @@ m.month ASC;