fix:近6个月统计涉密网络统计

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java

@@ -130,7 +130,7 @@ public class SysPropertynumController extends BaseController {
         return AjaxResult.success(obj);
     }
 
-    private List<String> bf = Arrays.asList("未报废", "已报废");
+    private List<String> bf = Arrays.asList("信息设备未报废", "信息设备已报废","设备未报废", "设备已报废");
 
     private List<String> xh = Arrays.asList("未销毁", "已销毁");
 
@@ -146,10 +146,18 @@ public class SysPropertynumController extends BaseController {
         List<JSONObject> datas = bf.stream()
                 .map(name -> {
                     AtomicReference<Object> value = new AtomicReference<>(0L);
-                    if ("未报废".equals(name)) {
+                    if ("信息设备未报废".equals(name)) {
                         value.set(propertyStateCountDTO.getWbf());
-                    } else {
+                    } else if("信息设备已报废".equals(name)) {
                         value.set(propertyStateCountDTO.getYbf());
+                    } else if("设备未报废".equals(name)) {
+                        value.set(tdPropertyEmentService.lambdaQuery()
+                                .eq(TdPropertyEment::getDestoryType,0)
+                                .count());
+                    }else{
+                        value.set(tdPropertyEmentService.lambdaQuery()
+                                .eq(TdPropertyEment::getDestoryType,1)
+                                .count());
                     }
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("value", value.get());