From 0e69db19818dc41f581f060233be7bc31bf23cdc Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Fri, 1 Nov 2024 22:25:51 +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=904?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/pojo/entity/GBaseAJJBXX.java  |  3 +++
 .../service/BusinessPoliceService.java        | 20 ++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/pojo/entity/GBaseAJJBXX.java b/src/main/java/com/biutag/supervision/pojo/entity/GBaseAJJBXX.java
index e1d9958..8b59fe2 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/GBaseAJJBXX.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/GBaseAJJBXX.java
@@ -55,4 +55,7 @@ public class GBaseAJJBXX {
 
     @TableField(exist = false)
     private Integer BARNum;
+
+    @TableField(exist = false)
+    private String JH;
 }
diff --git a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
index 1fefd7e..6e693f3 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
@@ -213,6 +213,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXX.setBADWIDmc((String)bar.get("BADWIDmc"));
                 gBaseAJJBXX.setXM((String)bar.get("XM"));
                 gBaseAJJBXX.setBARNum(Math.toIntExact((Long) bar.get("num")));
+                gBaseAJJBXX.setJH((String)bar.get("JH"));
                 gBaseAJJBXXMapSR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
@@ -231,6 +232,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXX.setBADWIDmc((String)bar.get("BADWIDmc"));
                 gBaseAJJBXX.setXM((String)bar.get("XM"));
                 gBaseAJJBXX.setBARNum(Math.toIntExact((Long) bar.get("num")));
+                gBaseAJJBXX.setJH((String)bar.get("JH"));
                 gBaseAJJBXXMapSR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
@@ -249,6 +251,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXX.setBADWIDmc((String)bar.get("BADWIDmc"));
                 gBaseAJJBXX.setXM((String)bar.get("XM"));
                 gBaseAJJBXX.setBARNum(Math.toIntExact((Long) bar.get("num")));
+                gBaseAJJBXX.setJH((String)bar.get("JH"));
                 gBaseAJJBXXMapLR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
@@ -267,6 +270,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXX.setBADWIDmc((String)bar.get("BADWIDmc"));
                 gBaseAJJBXX.setXM((String)bar.get("XM"));
                 gBaseAJJBXX.setBARNum(Math.toIntExact((Long) bar.get("num")));
+                gBaseAJJBXX.setJH((String)bar.get("JH"));
                 gBaseAJJBXXMapLR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
@@ -285,6 +289,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXX.setBADWIDmc((String)bar.get("BADWIDmc"));
                 gBaseAJJBXX.setXM((String)bar.get("XM"));
                 gBaseAJJBXX.setBARNum(Math.toIntExact((Long) bar.get("num")));
+                gBaseAJJBXX.setJH((String)bar.get("JH"));
                 gBaseAJJBXXMapPR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
@@ -303,6 +308,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXX.setBADWIDmc((String)bar.get("BADWIDmc"));
                 gBaseAJJBXX.setXM((String)bar.get("XM"));
                 gBaseAJJBXX.setBARNum(Math.toIntExact((Long) bar.get("num")));
+                gBaseAJJBXX.setJH((String)bar.get("JH"));
                 gBaseAJJBXXMapPR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
@@ -311,34 +317,34 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
     private ZFBAResult getZfbaResult(List<Date> happenTime) {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 4：受案
-        List<Map<String, Object>> bar1 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR1ID) as num, a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM " +
+        List<Map<String, Object>> bar1 = 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.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;");
-        List<Map<String, Object>> bar2 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR2ID) as num, a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM " +
+        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;");
         // 5：立案
-        List<Map<String, Object>> bar3 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR1ID) as num, a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM " +
+        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;");
-        List<Map<String, Object>> bar4 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR2ID) as num, a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM " +
+        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;");
         // 6：破案
-        List<Map<String, Object>> bar5 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR1ID) as num, a.BAR1ID, a.BADWIDdm, a.BADWIDmc, b.XM " +
+        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;");
-        List<Map<String, Object>> bar6 = modelClueDataMapper.selectByUniqueKeys("select COUNT(a.BAR2ID) as num, a.BAR2ID, a.BADWIDdm, a.BADWIDmc, b.XM " +
+        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 " +
@@ -380,7 +386,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         businessPolice.setGroupId(groupId);
         businessPolice.setNumber(gBaseAJJBXX.getBARNum());
         businessPolice.setPoliceName(gBaseAJJBXX.getXM());
-        businessPolice.setEmpNo(gBaseAJJBXX.getBARID());
+        businessPolice.setEmpNo(gBaseAJJBXX.getJH());
         businessPolice.setPoliceIdCode(hashConcatenatedStrings(businessPolice.getPoliceName(), businessPolice.getEmpNo()));
         if (type == 4) {
             businessPolice.setBusinessType("4");