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

1.冀北台账树逻辑调整

Browse Source 
2.冀北业务中台管理
This commit is contained in:
wr
2024-09-11 16:26:00 +08:00
parent b07ee843f0
commit b6fdd89192
14 changed files with 500 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
View File

@@ -156,6 +156,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
}
Map<String, LineDetailVO.Detail> mapDetail = new HashMap<>();
QueryWrapper<QuitRunningDeviceVO> quitRunningDeviceVOQueryWrapper = new QueryWrapper<>();
quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.state", DataStateEnum.ENABLE.getCode());
if (Objects.nonNull(quitRunningDeviceQueryParam)) {
//判断监测点/设备的选择
// if (Objects.nonNull(quitRunningDeviceQueryParam.getDeviceType()) && Objects.nonNull(quitRunningDeviceQueryParam.getDeviceId())) {

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

@@ -798,7 +798,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
userReportPO.setEvaluationDept(userExcel.getEvaluationDept());
userReportPO.setEvaluationConclusion(userExcel.getEvaluationConclusion());
userReportPO.setDataType(1);
userReportPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
userReportPO.setStatus(BpmTaskStatusEnum.APPROVE.getStatus());
userReportPO.setState(DataStateEnum.ENABLE.getCode());
this.baseMapper.insert(userReportPO);
//处理敏感用户的信息

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
View File

@@ -72,7 +72,7 @@ public class InstanceUtil {
List<String> delete = list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList());
//如果为空则需要判断信息，先判断全部数据是否都是自己创建的，然后判断是否是都是带提交数据
if (CollUtil.isEmpty(delete)) {
long count = list.stream().filter(x -> !userId.equals(x)).count();
long count = createBy.stream().filter(x -> !userId.equals(x)).count();
if (count > 0) {
throw new BusinessException(SupervisionResponseEnum.NO_POWER);
} else {