lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

质安bug修改

Browse Source
This commit is contained in:
zrl
2025-12-23 15:59:42 +08:00
parent c6b80dd2af
commit 14a5c833bf
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/enums/DpEnum.java
View File

@ -2,9 +2,13 @@ package org.dromara.bigscreen.enums;
public enum DpEnum { public enum DpEnum {
AQGLLX_ZXGL("安全-专项检查", "3"),
AQGLLX_DQJC("定期检查", "2"),
AQGLLX_RCXJ("日常巡检", "1"),
ZLGLLX_ZXGL("专项检查", "1"), ZLGLLX_ZXGL("专项检查", "1"),
ZLGLLX_DQJC("定期检查", "2"), ZLGLLX_DQJC("定期检查", "3"),
ZLGLLX_RCXJ("日常巡检", "3"), ZLGLLX_RCXJ("日常巡检", "2"),
ZLGDZT_ZG("工单状态-整改", "1"), ZLGDZT_ZG("工单状态-整改", "1"),
RYZT_ZG("人员状态-在岗", "1"), RYZT_ZG("人员状态-在岗", "1"),
RYZT_LG("工单状态-离岗", "0"), RYZT_LG("工单状态-离岗", "0"),

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java
View File

@ -189,9 +189,9 @@ public class DpzaglServiceImpl implements DpzaglService {
dpznglVo.setAqZS(Long.valueOf(list.size())); dpznglVo.setAqZS(Long.valueOf(list.size()));
dpznglVo.setAqList(MapstructUtils.convert(list, HseSafetyInspectionVo.class)); dpznglVo.setAqList(MapstructUtils.convert(list, HseSafetyInspectionVo.class));
dpznglVo.getAqList().forEach(zl ->{zl.setCreatorName(userService.selectNicknameByIds(zl.getCreateBy().toString()));}); 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.setZxjcAq(list.stream().filter(zl -> DpEnum.AQGLLX_ZXGL.getTypeValue().equals(zl.getCheckType())).count());
dpznglVo.setDqjcAq(list.stream().filter(zl -> DpEnum.ZLGLLX_DQJC.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.ZLGLLX_RCXJ.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()); dpznglVo.setAqZgsl(list.stream().filter(zl -> DpEnum.ZLGDZT_ZG.getTypeValue().equals(zl.getReviewType())).count());
List<HseSafetyInspectionVo> convert = MapstructUtils.convert(list.stream().filter(zl -> DpEnum.ZLGDZT_ZG.getTypeValue().equals(zl.getReviewType())).collect(Collectors.toList()), HseSafetyInspectionVo.class); List<HseSafetyInspectionVo> 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()));}); convert.forEach(zl ->{if (zl.getCorrectorId() != null)zl.setCorrectorName(userService.selectNicknameByIds(zl.getCorrectorId().toString()));});