From b73a0dd5611787a8de4e13556feb8a15686a30f4 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Fri, 11 Oct 2024 11:27:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=916=E4=B8=AA=E6=9C=88=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=B6=89=E5=AF=86=E7=BD=91=E7=BB=9C=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/SysPropertynumController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java index c4ba891..bad0b72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java +++ b/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 bf = Arrays.asList("未报废", "已报废"); + private List bf = Arrays.asList("信息设备未报废", "信息设备已报废","设备未报废", "设备已报废"); private List xh = Arrays.asList("未销毁", "已销毁"); @@ -146,10 +146,18 @@ public class SysPropertynumController extends BaseController { List datas = bf.stream() .map(name -> { AtomicReference 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());