Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

增加二级评估用户绑定

Browse Source
This commit is contained in:
wr
2025-12-29 09:27:03 +08:00
parent c3cc39973e
commit ea2173fff4
6 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
View File

@@ -155,6 +155,7 @@ public class UserReportParam {
private UserReportSubstationPO userReportSubstationPO;
private String secondAssessmentId;
/**
* 流程实例的编号

5
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserLedgerVO.java
View File

@@ -23,4 +23,9 @@ public class UserLedgerVO implements Serializable {
private String city;
@Data
public static class AssessMent extends UserLedgerVO{
private String secondAssessmentId;
}
}

18
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
View File

@@ -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<Boolean> 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<List<UserLedgerVO.AssessMent>> selectUserAssessMentList(@RequestBody UserReportParam userReportParam) {
String methodDescribe = getMethodDescribe("selectUserAssessMentList");
List<UserLedgerVO.AssessMent> userReportPOS = userReportPOService.selectUserAssessMentList(userReportParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportPOS, methodDescribe);
}
}

3
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java
View File

@@ -73,4 +73,7 @@ public interface UserReportPOService extends IBpmService<UserReportPO> {
List<UserReportPO> getSensitiveUserByDept(SensitiveUserParam param);
Boolean bindAssessmentId(String userReportId,String assessMentId);
List<UserLedgerVO.AssessMent> selectUserAssessMentList(UserReportParam userReportParam);
}

60
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -129,7 +129,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
if (ObjectUtil.isNotNull(userReportParam.getDataType())) {
userReportPO.setDataType(userReportParam.getDataType());
if (userReportParam.getDataType() == 1) {
if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportParam.getUserType())){
if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportParam.getUserType())) {
userReportPO.setStatus(BpmTaskStatusEnum.APPROVE.getStatus());
}
}
@@ -246,7 +246,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
Map<String, Object> 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<UserReportPOMapper, Use
userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
}
userReportVOQueryWrapper
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> 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<UserReportPOMapper, Use
public BpmInstanceInfo getInstanceInfo(String businessId) {
BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
UserReportPO userReportPO = this.getById(businessId);
if(Objects.isNull(userReportPO)){
if (Objects.isNull(userReportPO)) {
return null;
}
bpmInstanceInfo.setHistoryInstanceId(userReportPO.getHistoryInstanceId());
@@ -455,7 +455,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
.select(UserReportPO::getProcessInstanceId);
List<UserReportPO> userReportPOList = this.baseMapper.selectList(lambdaQueryWrapper);
List<String> 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<UserReportPOMapper, Use
if (!allDataFlag) {
//台账不查询全部数据，需要排除敏感及重要用户
userReportVOQueryWrapper.ne("supervision_user_report.user_type", UserNatureEnum.SENSITIVE_USER.getCode())
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> 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<UserReportPOMapper, Use
try {
List<SensitiveUserSExcel> 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<UserReportPOMapper, Use
@Override
public Boolean deleteUserReport(List<String> supervisionId) {
List<UserReportPO> 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<UserReportPOMapper, Use
public List<UserLedgerVO> selectUserList(UserReportParam userReportParam) {
LambdaQueryWrapper<UserReportPO> 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<UserReportPO> list = this.list(lambdaQueryWrapper);
return BeanUtil.copyToList(list,UserLedgerVO.class);
return BeanUtil.copyToList(list, UserLedgerVO.class);
}
@Override
public UserLedgerVO selectUserInfo(String id) {
LambdaQueryWrapper<UserReportPO> 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<UserReportPOMapper, Use
return this.baseMapper.selectList(userReportVOQueryWrapper);
}
@Override
public Boolean bindAssessmentId(String userReportId, String assessMentId) {
if (StrUtil.isBlank(assessMentId)||"null".equals(assessMentId)) {
assessMentId = null;
}
return this.update(new LambdaUpdateWrapper<UserReportPO>()
.set(UserReportPO::getSecondAssessmentId, assessMentId)
.eq(UserReportPO::getId, userReportId));
}
@Override
public List<UserLedgerVO.AssessMent> selectUserAssessMentList(UserReportParam userReportParam) {
List<String> data = deptFeignClient.getDepSonIdtByDeptId(userReportParam.getOrgId()).getData();
LambdaQueryWrapper<UserReportPO> 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<String, String> getTreeString(String name, List<SysDicTreePO> treeVOS) {
Map<String, String> info = new LinkedHashMap<>();
for (SysDicTreePO sysMenuDtoChild : treeVOS) {
@@ -1365,7 +1387,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
LambdaQueryWrapper<UserReportPO> 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) {