From 41be99a6d25c56ffa671de5e12e54117de335fa8 Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Fri, 1 Nov 2024 22:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE-=E4=B8=AA=E4=BA=BA=E4=B8=9A=E5=8A=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE-110=E3=80=81122=E7=9A=84=E5=8F=96=E5=80=BC=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=905?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/service/BusinessPoliceService.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
index 6e693f3..a59c7fb 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
@@ -321,34 +321,34 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 "FROM dwd_asj_zfba_ajjbxx a " +
                 "LEFT JOIN dwd_ry_zfba_baryxx b ON a.BAR1ID = b.ZJ " +
                 "WHERE a.SLRQ BETWEEN '" + formatter.format(happenTime.get(0)) + "' AND '" + formatter.format(happenTime.get(1)) + "' AND a.AJBZdm !=3 " +
-                "GROUP BY a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM;");
+                "GROUP BY a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH;");
         List<Map<String, Object>> bar2 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR2ID) as num, a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH " +
                 "FROM dwd_asj_zfba_ajjbxx a " +
                 "LEFT JOIN dwd_ry_zfba_baryxx b ON a.BAR2ID = b.ZJ " +
                 "WHERE a.SLRQ BETWEEN '" + formatter.format(happenTime.get(0)) + "' AND '" + formatter.format(happenTime.get(1)) + "' AND a.AJBZdm !=3 " +
-                "GROUP BY a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM;");
+                "GROUP BY a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH;");
         // 5：立案
         List<Map<String, Object>> bar3 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR1ID) as num, a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH " +
                 "FROM dwd_asj_zfba_ajjbxx a " +
                 "LEFT JOIN dwd_ry_zfba_baryxx b ON a.BAR1ID = b.ZJ " +
                 "WHERE a.LARQ BETWEEN '" + formatter.format(happenTime.get(0)) + "' AND '" + formatter.format(happenTime.get(1)) + "' AND a.AJBZdm !=3 " +
-                "GROUP BY a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM;");
+                "GROUP BY a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH;");
         List<Map<String, Object>> bar4 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR2ID) as num, a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH " +
                 "FROM dwd_asj_zfba_ajjbxx a " +
                 "LEFT JOIN dwd_ry_zfba_baryxx b ON a.BAR2ID = b.ZJ " +
                 "WHERE a.LARQ BETWEEN '" + formatter.format(happenTime.get(0)) + "' AND '" + formatter.format(happenTime.get(1)) + "' AND a.AJBZdm !=3 " +
-                "GROUP BY a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM;");
+                "GROUP BY a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH;");
         // 6：破案
         List<Map<String, Object>> bar5 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR1ID) as num, a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH " +
                 "FROM dwd_asj_zfba_ajjbxx a " +
                 "LEFT JOIN dwd_ry_zfba_baryxx b ON a.BAR1ID = b.ZJ " +
                 "WHERE a.PARQ BETWEEN '" + formatter.format(happenTime.get(0)) + "' AND '" + formatter.format(happenTime.get(1)) + "' AND a.AJBZdm !=3 " +
-                "GROUP BY a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM;");
+                "GROUP BY a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH;");
         List<Map<String, Object>> bar6 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR2ID) as num, a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH " +
                 "FROM dwd_asj_zfba_ajjbxx a " +
                 "LEFT JOIN dwd_ry_zfba_baryxx b ON a.BAR2ID = b.ZJ " +
                 "WHERE a.PARQ BETWEEN '" + formatter.format(happenTime.get(0)) + "' AND '" + formatter.format(happenTime.get(1)) + "' AND a.AJBZdm !=3 " +
-                "GROUP BY a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM;");
+                "GROUP BY a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM, b.JH;");
         ZFBAResult zfbaresult = new ZFBAResult(bar1, bar2, bar3, bar4, bar5, bar6);
         return zfbaresult;
     }