diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java index 6137ec9fc..56030d80b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java @@ -141,6 +141,10 @@ public class UserReportVO { private Integer dataType; private String createBy; + /** + * 是否需要治理 + */ + private Integer needGovernance; /** * 创建时间 diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 72084b1b9..523a78cf3 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -420,7 +420,35 @@ public class UserReportPOServiceImpl extends ServiceImpl(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper); + Page page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper); + + page.getRecords().forEach(temp->{ + Integer needGovernance = 0; + if ( + CollectionUtil.newArrayList( + UserNatureEnum.BUILD_POWER_GRID.getCode(), + UserNatureEnum.EXTEND_POWER_GRID.getCode() + ).contains(temp.getUserType())) { + //电网工程类用户额外数据 + needGovernance = userReportProjectPOService.getById(temp.getId()).getNeedGovernance(); + } else if ( + CollectionUtil.newArrayList( + UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(), + UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(), + UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(), + UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode() + ).contains(temp.getUserType())) { + //非线性负荷用户 & 新能源发电站用户 + + needGovernance = userReportSubstationPOService.getById(temp.getId()).getNeedGovernance(); + } else if (UserNatureEnum.SENSITIVE_USER.getCode().equals(temp.getUserType())) { + // 敏感及重要用户 + needGovernance = userReportSensitivePOService.getById(temp.getId()).getNeedGovernance(); + } + + temp.setNeedGovernance(needGovernance); + }); + return page; } @Override