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