From 4fb9148adbee4ea5b1289286b86eba8c91b44f64 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, 31 Oct 2024 19:22:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/mapper/DataPetitionComplaintMapper.java   | 8 ++++----
 .../supervision/service/DataPetitionComplaintService.java | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
index f8c16d0..843a339 100644
--- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
@@ -21,7 +21,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
      */
     @Select("SELECT sd.id, sd.short_name label,count(*) value " +
             "FROM (SELECT * FROM data_petition_complaint dpc " +
-            "WHERE dpc.create_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
+            "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{departId} and temp.initial_petition=#{Repeat} " +
             "GROUP BY temp.second_depart_id")
@@ -36,7 +36,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
      */
     @Select("SELECT sd.id, sd.short_name label,count(*) value " +
             "FROM (SELECT * FROM data_petition_complaint dpc " +
-            "WHERE dpc.create_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
+            "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{departId} and temp.receiving_leader_name is not null  " +
             "GROUP BY temp.second_depart_id")
@@ -53,7 +53,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
      */
     @Select("SELECT sd.id, sd.short_name label,count(*) value " +
             "FROM (SELECT * FROM data_petition_complaint dpc " +
-            "WHERE dpc.create_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
+            "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{id} AND entanglement_visits =#{isEntanglement} " +
             "GROUP BY temp.second_depart_id")
@@ -62,7 +62,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
 
     @Select("SELECT sd.id, sd.short_name label,count(*) value " +
             "FROM (SELECT * FROM data_petition_complaint dpc " +
-            "WHERE dpc.create_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
+            "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{id} AND mass_visits =#{isMass} " +
             "GROUP BY temp.second_depart_id")
diff --git a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java
index 0e7ff69..713cfdf 100644
--- a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java
+++ b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java
@@ -124,7 +124,9 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
 
     //所有分类数据总数
     public JSONObject allMailCount(Date beginTime, Date endTime) {
-        long totalMail = this.count();
+        QueryWrapper<DataPetitionComplaint> totalQueryWrapper = new QueryWrapper<>();
+        totalQueryWrapper.between("discovery_time", beginTime, endTime);
+        long totalMail = this.count(totalQueryWrapper);
         // 国家信访
         QueryWrapper<DataPetitionComplaint> countryQueryWrapper = new QueryWrapper<>();
         countryQueryWrapper.eq("problem_sources_code", 21);
@@ -155,12 +157,12 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
         leaderViewQueryWrapper.isNotNull("receiving_leader_name");
         leaderViewQueryWrapper.between("discovery_time", beginTime, endTime);
         Long leaderViewMail = dataPetitionComplaintMapper.selectCount(leaderViewQueryWrapper);
-        // 闹访
+        // 闹访  1：闹  2：不闹
         QueryWrapper<DataPetitionComplaint> tangleQueryWrapper = new QueryWrapper<>();
         tangleQueryWrapper.eq("entanglement_visits", 1);
         tangleQueryWrapper.between("discovery_time", beginTime, endTime);
         Long tangleMail = dataPetitionComplaintMapper.selectCount(tangleQueryWrapper);
-        // 集访
+        // 集访   1：集    2：不集
         QueryWrapper<DataPetitionComplaint> massQueryWrapper = new QueryWrapper<>();
         massQueryWrapper.eq("mass_visits", 1);
         massQueryWrapper.between("discovery_time", beginTime, endTime);

From c7d184ed6cff32dcc31b108b24be55876df4b4a8 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, 31 Oct 2024 19:30:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DataPetitionComplaintMapper.java          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
index 843a339..201a4d2 100644
--- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
@@ -24,7 +24,8 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{departId} and temp.initial_petition=#{Repeat} " +
-            "GROUP BY temp.second_depart_id")
+            "GROUP BY temp.second_depart_id" +
+            "ORDER BY value DESC")
     List<CaseVerifDepart> selectDepartStatistic(Integer departId, Integer Repeat, Date beginTime, Date endTime);
 
     /**
@@ -39,7 +40,8 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{departId} and temp.receiving_leader_name is not null  " +
-            "GROUP BY temp.second_depart_id")
+            "GROUP BY temp.second_depart_id" +
+            "ORDER BY value DESC")
     List<CaseVerifDepart> selectLeaderViewMail(Integer departId, Date beginTime, Date endTime);
 
 
@@ -56,7 +58,8 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{id} AND entanglement_visits =#{isEntanglement} " +
-            "GROUP BY temp.second_depart_id")
+            "GROUP BY temp.second_depart_id" +
+            "ORDER BY value DESC")
     List<CaseVerifDepart>  selectEntanglementMail(Integer id, int isEntanglement, Date beginTime, Date endTime);
 
 
@@ -65,6 +68,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{id} AND mass_visits =#{isMass} " +
-            "GROUP BY temp.second_depart_id")
+            "GROUP BY temp.second_depart_id" +
+            "ORDER BY value DESC")
     List<CaseVerifDepart> selectMassMail(Integer id, int isMass, Date beginTime, Date endTime);
 }

From a46221a8468729b549e401a86b0155cc85810b66 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, 31 Oct 2024 19:40:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF1.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/mapper/DataPetitionComplaintMapper.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
index 201a4d2..b45bd53 100644
--- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
@@ -24,7 +24,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{departId} and temp.initial_petition=#{Repeat} " +
-            "GROUP BY temp.second_depart_id" +
+            "GROUP BY temp.second_depart_id " +
             "ORDER BY value DESC")
     List<CaseVerifDepart> selectDepartStatistic(Integer departId, Integer Repeat, Date beginTime, Date endTime);
 
@@ -40,7 +40,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{departId} and temp.receiving_leader_name is not null  " +
-            "GROUP BY temp.second_depart_id" +
+            "GROUP BY temp.second_depart_id " +
             "ORDER BY value DESC")
     List<CaseVerifDepart> selectLeaderViewMail(Integer departId, Date beginTime, Date endTime);
 
@@ -58,7 +58,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{id} AND entanglement_visits =#{isEntanglement} " +
-            "GROUP BY temp.second_depart_id" +
+            "GROUP BY temp.second_depart_id " +
             "ORDER BY value DESC")
     List<CaseVerifDepart>  selectEntanglementMail(Integer id, int isEntanglement, Date beginTime, Date endTime);
 
@@ -68,7 +68,7 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "WHERE dpc.discovery_time BETWEEN #{beginTime} AND #{endTime}) as temp " +
             "INNER JOIN sup_depart sd on sd.id=temp.second_depart_id " +
             "WHERE sd.statistics_group_id=#{id} AND mass_visits =#{isMass} " +
-            "GROUP BY temp.second_depart_id" +
+            "GROUP BY temp.second_depart_id " +
             "ORDER BY value DESC")
     List<CaseVerifDepart> selectMassMail(Integer id, int isMass, Date beginTime, Date endTime);
 }