修改统计问题

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -334,9 +334,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
 
         Map<String, Object> result = new HashMap<>();
 
-        int wcl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("未处理"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
-        int ycl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("已处理", "已恢复"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
-
+        int wcl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("未处理", "未确认"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
+        int ycl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("已处理", "已恢复","已关闭"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
+        
         result.put("wcl", wcl);
         result.put("ycl", ycl);
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java

@@ -190,11 +190,11 @@ public class TdHygfJpInverterWarnServiceImpl
         return tdHygfJpInverterWarnMapper.selectWarnListTotal(state,regionalCompaniesCode,amosCompanyCode,thirdStationId,type, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus, stationName);
     }
 
-    public int selectWarnTotal(List<String> state, String regionalCompaniesCode,
+    public int selectWarnTotal(List<String> state,String regionalCompaniesCode,
                                String amosCompanyCode,
                                String thirdStationId,
                                String type) {
-        return tdHygfJpInverterWarnMapper.selectWarnTotal(state, regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
+        return tdHygfJpInverterWarnMapper.selectWarnTotal(state,regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
     }
 
     public Map<String, Object> queryAlarmNumber(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type) {