diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml index cb521390f..e47dad1f1 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml @@ -123,7 +123,10 @@ AND (sub.NAME LIKE #{searchValueLike} OR dev.name LIKE #{searchValueLike} - OR line.NAME LIKE #{searchValueLike}) + OR line.NAME LIKE #{searchValueLike} + OR loadtypeId.Name LIKE #{searchValueLike} + OR manufacturerId.name LIKE #{searchValueLike} + ) ORDER BY gdName, diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java index 453b0b433..2ee4cf3f3 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java @@ -155,6 +155,7 @@ public class UserReportParam { private UserReportSubstationPO userReportSubstationPO; + private String secondAssessmentId; /** * 流程实例的编号 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserLedgerVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserLedgerVO.java index 16011ea97..9bf39f984 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserLedgerVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserLedgerVO.java @@ -23,4 +23,9 @@ public class UserLedgerVO implements Serializable { private String city; + @Data + public static class AssessMent extends UserLedgerVO{ + + private String secondAssessmentId; + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index bbabc84b2..5c8768b00 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -293,7 +293,6 @@ public class UserReportManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportByIds, methodDescribe); } - //根据部门查询敏感用户信息 @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getSensitiveUserByDept") @ApiOperation("根据部门获取敏感用户信息") @@ -304,4 +303,21 @@ public class UserReportManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/bindAssessmentId") + @ApiOperation("根据用户id绑定二级评估id") + public HttpResult bindAssessmentId(@RequestParam("userReportId") String userReportId,@RequestParam("assessMentId") String assessMentId) { + String methodDescribe = getMethodDescribe("bindAssessmentId"); + Boolean b = userReportPOService.bindAssessmentId(userReportId, assessMentId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/selectUserAssessMentList") + @ApiOperation("二级评估查询用户接口") + public HttpResult> selectUserAssessMentList(@RequestBody UserReportParam userReportParam) { + String methodDescribe = getMethodDescribe("selectUserAssessMentList"); + List userReportPOS = userReportPOService.selectUserAssessMentList(userReportParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportPOS, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java index 4a0b8b8c7..d29caa187 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java @@ -73,4 +73,7 @@ public interface UserReportPOService extends IBpmService { List getSensitiveUserByDept(SensitiveUserParam param); + Boolean bindAssessmentId(String userReportId,String assessMentId); + + List selectUserAssessMentList(UserReportParam userReportParam); } 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 a8a9ceef4..7e1229392 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 @@ -129,7 +129,7 @@ public class UserReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(16); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); String key = SupervisionKeyEnum.BUILD_USER_INFO.getKey(); - if(ObjectUtil.isNotNull(userReportPO.getDataType())){ + if (ObjectUtil.isNotNull(userReportPO.getDataType())) { //干扰源用户台账和敏感用户审核流程 if (userReportPO.getDataType() == 1) { key = SupervisionKeyEnum.BUILD_USER_INFO_ARCHIVIST.getKey(); @@ -327,7 +327,7 @@ public class UserReportPOServiceImpl extends ServiceImpl w.in("supervision_user_report.status", InstanceUtil.filterTaskStatus()) + .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_user_report.status", InstanceUtil.filterTaskStatus()) .or() .eq("supervision_user_report.create_by", RequestUtil.getUserIndex()) ); @@ -436,7 +436,7 @@ public class UserReportPOServiceImpl extends ServiceImpl userReportPOList = this.baseMapper.selectList(lambdaQueryWrapper); List result = userReportPOList.stream().map(UserReportPO::getProcessInstanceId).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(result)){ + if (CollectionUtil.isNotEmpty(result)) { rejectInstanceIds.addAll(result); } return rejectInstanceIds; @@ -503,11 +503,11 @@ public class UserReportPOServiceImpl extends ServiceImpl w.in("supervision_user_report.status", InstanceUtil.filterTaskStatus()) + .and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()), w -> w.in("supervision_user_report.status", InstanceUtil.filterTaskStatus()) .or() .eq("supervision_user_report.create_by", RequestUtil.getUserIndex()) ); - }else{ + } else { userReportVOQueryWrapper.eq("supervision_user_report.status", FlowStatusEnum.APPROVE.getCode()); } if (Objects.nonNull(userReportQueryParam)) { @@ -801,7 +801,7 @@ public class UserReportPOServiceImpl extends ServiceImpl sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcel(file.getInputStream(), SensitiveUserSExcel.class, params); sensitiveUserExcels = sensitiveUserExcelExcelImportResult.stream().filter(x -> StringUtils.isNotBlank(x.getCity())).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(sensitiveUserExcels)){ + if (CollectionUtil.isEmpty(sensitiveUserExcels)) { throw new BusinessException(SupervisionResponseEnum.IMPORT_DEV_DATA_ERROR); } //如果存在非法数据，将不合格的数据导出 @@ -1165,7 +1165,7 @@ public class UserReportPOServiceImpl extends ServiceImpl supervisionId) { List userReportPOS = this.listByIds(supervisionId); - if(CollUtil.isEmpty(userReportPOS)){ + if (CollUtil.isEmpty(userReportPOS)) { throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT); } //判断是否有权限操作 @@ -1181,29 +1181,29 @@ public class UserReportPOServiceImpl extends ServiceImpl selectUserList(UserReportParam userReportParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(StrUtil.isNotBlank(userReportParam.getCity())){ - lambdaQueryWrapper.in(UserReportPO::getCity,Stream.of(userReportParam.getCity()).collect(Collectors.toList())); + if (StrUtil.isNotBlank(userReportParam.getCity())) { + lambdaQueryWrapper.in(UserReportPO::getCity, Stream.of(userReportParam.getCity()).collect(Collectors.toList())); } - if(StrUtil.isNotBlank(userReportParam.getStationId())){ - lambdaQueryWrapper.eq(UserReportPO::getStationId,userReportParam.getStationId()); + if (StrUtil.isNotBlank(userReportParam.getStationId())) { + lambdaQueryWrapper.eq(UserReportPO::getStationId, userReportParam.getStationId()); } if (ObjectUtil.isNotNull(userReportParam.getUserType())) { lambdaQueryWrapper.eq(UserReportPO::getUserType, userReportParam.getUserType()); } - lambdaQueryWrapper.eq(UserReportPO::getState,DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); List list = this.list(lambdaQueryWrapper); - return BeanUtil.copyToList(list,UserLedgerVO.class); + return BeanUtil.copyToList(list, UserLedgerVO.class); } @Override public UserLedgerVO selectUserInfo(String id) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(UserReportPO::getId,id).eq(UserReportPO::getState,DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.eq(UserReportPO::getId, id).eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); UserReportPO userReportPO = this.getById(id); - if(Objects.nonNull(userReportPO)){ - return BeanUtil.copyProperties(userReportPO,UserLedgerVO.class); + if (Objects.nonNull(userReportPO)) { + return BeanUtil.copyProperties(userReportPO, UserLedgerVO.class); } return null; } @@ -1320,6 +1320,28 @@ public class UserReportPOServiceImpl extends ServiceImpl() + .set(UserReportPO::getSecondAssessmentId, assessMentId) + .eq(UserReportPO::getId, userReportId)); + } + + @Override + public List selectUserAssessMentList(UserReportParam userReportParam) { + List data = deptFeignClient.getDepSonIdtByDeptId(userReportParam.getOrgId()).getData(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(UserReportPO::getOrgId, data); + lambdaQueryWrapper.and(x -> x.isNull(UserReportPO::getSecondAssessmentId) + .or() + .eq(UserReportPO::getSecondAssessmentId, userReportParam.getSecondAssessmentId())); + lambdaQueryWrapper.eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); + return BeanUtil.copyToList(this.list(lambdaQueryWrapper), UserLedgerVO.AssessMent.class); + } + public Map getTreeString(String name, List treeVOS) { Map info = new LinkedHashMap<>(); for (SysDicTreePO sysMenuDtoChild : treeVOS) { @@ -1365,7 +1387,7 @@ public class UserReportPOServiceImpl extends ServiceImpl userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); userReportPOLambdaQueryWrapper .eq(UserReportPO::getProjectName, userReportParam.getProjectName()) - .in(UserReportPO::getStatus, CollectionUtil.newArrayList(BpmProcessInstanceStatusEnum.AWAIT.getStatus(),BpmProcessInstanceStatusEnum.RUNNING.getStatus(), BpmProcessInstanceStatusEnum.APPROVE.getStatus())) + .in(UserReportPO::getStatus, CollectionUtil.newArrayList(BpmProcessInstanceStatusEnum.AWAIT.getStatus(), BpmProcessInstanceStatusEnum.RUNNING.getStatus(), BpmProcessInstanceStatusEnum.APPROVE.getStatus())) .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); //更新的时候，需排除当前记录 if (isExcludeSelf) {