消防执法动态-当月执法情况

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemLawStatisticsServiceImpl.java

@@ -25,10 +25,15 @@ public class DemLawStatisticsServiceImpl extends AbstractCrudService<DemLawStati
     @Override
     public Map<String, Object> lawStatistics(Date startTime, Date endTime) {
         QueryWrapper<DemLawStatistics> query = Wrappers.query();
+//        query.select("COALESCE(sum(inspect_company)) as `检查家次(家)`", "COALESCE(sum( fire_hazard)) as `发现隐患(起)`",
+//                "COALESCE(sum(rectificate_fire_hazard)) as `整改隐患(起)`", "COALESCE(sum(penalty_amount)) as `处罚金额(万元)`",
+//                "COALESCE(sum(correction_notice)) as `责令整改(份)`", "COALESCE(sum(punishment_decision)) as `处罚决定书(份)`",
+//                "COALESCE(sum(order_three_stops)) as `责令三停(家)`", "COALESCE(sum(temporary_seizure)) as `临时查封(份)`")
+//                .eq("delete_flag", 0)
+//                .between("chg_time", startTime, endTime);
         query.select("COALESCE(sum(inspect_company)) as `检查家次(家)`", "COALESCE(sum( fire_hazard)) as `发现隐患(起)`",
                 "COALESCE(sum(rectificate_fire_hazard)) as `整改隐患(起)`", "COALESCE(sum(penalty_amount)) as `处罚金额(万元)`",
-                "COALESCE(sum(correction_notice)) as `责令整改(份)`", "COALESCE(sum(punishment_decision)) as `处罚决定书(份)`",
-                "COALESCE(sum(order_three_stops)) as `责令三停(家)`", "COALESCE(sum(temporary_seizure)) as `临时查封(份)`")
+                "COALESCE(sum(order_three_stops)) as `责令三停(家)`")
                 .eq("delete_flag", 0)
                 .between("chg_time", startTime, endTime);
         List<Map<String, Object>> list = this.listMaps(query);
@@ -37,10 +42,10 @@ public class DemLawStatisticsServiceImpl extends AbstractCrudService<DemLawStati
         map.put("发现隐患(起)",0);
         map.put("整改隐患(起)",0);
         map.put("处罚金额(万元)",0);
-        map.put("责令整改(份)",0);
-        map.put("处罚决定书(份)",0);
+//        map.put("责令整改(份)",0);
+//        map.put("处罚决定书(份)",0);
         map.put("责令三停(家)",0);
-        map.put("临时查封(份)",0);
+//        map.put("临时查封(份)",0);
         if (CollectionUtils.isNotEmpty(list)){
             if (CollectionUtils.isNotEmpty(list.get(0))){
                 return list.get(0);