From 14a5c833bf659c8d93919dd11f3b14d3475c888c Mon Sep 17 00:00:00 2001 From: zrl <1720989295@qq.com> Date: Tue, 23 Dec 2025 15:59:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E5=AE=89bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/bigscreen/enums/DpEnum.java | 8 ++++++-- .../dromara/bigscreen/service/impl/DpzaglServiceImpl.java | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/enums/DpEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/enums/DpEnum.java index 47459888..14ed2dcb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/enums/DpEnum.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/enums/DpEnum.java @@ -2,9 +2,13 @@ package org.dromara.bigscreen.enums; public enum DpEnum { + AQGLLX_ZXGL("安全-专项检查", "3"), + AQGLLX_DQJC("定期检查", "2"), + AQGLLX_RCXJ("日常巡检", "1"), + ZLGLLX_ZXGL("专项检查", "1"), - ZLGLLX_DQJC("定期检查", "2"), - ZLGLLX_RCXJ("日常巡检", "3"), + ZLGLLX_DQJC("定期检查", "3"), + ZLGLLX_RCXJ("日常巡检", "2"), ZLGDZT_ZG("工单状态-整改", "1"), RYZT_ZG("人员状态-在岗", "1"), RYZT_LG("工单状态-离岗", "0"), diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java index cfde915a..1833fb26 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java @@ -189,9 +189,9 @@ public class DpzaglServiceImpl implements DpzaglService { dpznglVo.setAqZS(Long.valueOf(list.size())); dpznglVo.setAqList(MapstructUtils.convert(list, HseSafetyInspectionVo.class)); dpznglVo.getAqList().forEach(zl ->{zl.setCreatorName(userService.selectNicknameByIds(zl.getCreateBy().toString()));}); - dpznglVo.setZxjcAq(list.stream().filter(zl -> DpEnum.ZLGLLX_ZXGL.getTypeValue().equals(zl.getCheckType())).count()); - dpznglVo.setDqjcAq(list.stream().filter(zl -> DpEnum.ZLGLLX_DQJC.getTypeValue().equals(zl.getCheckType())).count()); - dpznglVo.setRcxjAq(list.stream().filter(zl -> DpEnum.ZLGLLX_RCXJ.getTypeValue().equals(zl.getCheckType())).count()); + dpznglVo.setZxjcAq(list.stream().filter(zl -> DpEnum.AQGLLX_ZXGL.getTypeValue().equals(zl.getCheckType())).count()); + dpznglVo.setDqjcAq(list.stream().filter(zl -> DpEnum.AQGLLX_DQJC.getTypeValue().equals(zl.getCheckType())).count()); + dpznglVo.setRcxjAq(list.stream().filter(zl -> DpEnum.AQGLLX_RCXJ.getTypeValue().equals(zl.getCheckType())).count()); dpznglVo.setAqZgsl(list.stream().filter(zl -> DpEnum.ZLGDZT_ZG.getTypeValue().equals(zl.getReviewType())).count()); List convert = MapstructUtils.convert(list.stream().filter(zl -> DpEnum.ZLGDZT_ZG.getTypeValue().equals(zl.getReviewType())).collect(Collectors.toList()), HseSafetyInspectionVo.class); convert.forEach(zl ->{if (zl.getCorrectorId() != null)zl.setCorrectorName(userService.selectNicknameByIds(zl.getCorrectorId().toString()));});