修改基础数据-个人业务数据-110、122的取值来源5

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