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

冀北现场问题调整

Browse Source
This commit is contained in:
xy
2025-01-06 15:34:33 +08:00
parent 11116929cc
commit 149d017c49
10 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
View File

@@ -143,13 +143,15 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService
//流程状态排除不通过的，不通过会放在待办中，一直到该流程通过
processInstanceQuery.variableValueNotEquals(BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmTaskStatusEnum.REJECT.getStatus());
if (Objects.nonNull(bpmProcessInstancePageParam.getSearchBeginTime()) && Objects.nonNull(bpmProcessInstancePageParam.getSearchEndTime())) {
String beginTimeStr = bpmProcessInstancePageParam.getSearchBeginTime();
String endTimeStr = bpmProcessInstancePageParam.getSearchEndTime();
LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
processInstanceQuery.startedBefore(DateUtils.of(endTime));
processInstanceQuery.startedAfter(DateUtils.of(beginTime));
}
String beginTimeStr = bpmProcessInstancePageParam.getSearchBeginTime();
String endTimeStr = bpmProcessInstancePageParam.getSearchEndTime();
LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
processInstanceQuery.startedBefore(DateUtils.of(endTime));
processInstanceQuery.startedAfter(DateUtils.of(beginTime));
// 查询数量
long processInstanceCount = processInstanceQuery.count();
if (processInstanceCount == 0) {

14
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java
View File

@@ -142,12 +142,14 @@ public class BpmTaskServiceImpl implements IBpmTaskService {
if (StrUtil.isNotBlank(bpmTaskQueryParam.getSearchValue())) {
taskQuery.processDefinitionNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%");
}
String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
String endTimeStr = bpmTaskQueryParam.getSearchEndTime();
LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
taskQuery.taskCreatedBefore(DateUtils.of(endTime));
taskQuery.taskCreatedAfter(DateUtils.of(beginTime));
if (Objects.nonNull(bpmTaskQueryParam.getSearchBeginTime()) && Objects.nonNull(bpmTaskQueryParam.getSearchEndTime())) {
String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
String endTimeStr = bpmTaskQueryParam.getSearchEndTime();
LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
taskQuery.taskCreatedBefore(DateUtils.of(endTime));
taskQuery.taskCreatedAfter(DateUtils.of(beginTime));
}
// 执行查询
long count = taskQuery.count();
if (count == 0) {

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

@@ -224,7 +224,9 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
.distinct()
.collect(Collectors.toList());
QueryWrapper<LineWarning> queryWrapper = new QueryWrapper<>();
queryWrapper.between("A.alarm_time", param.getSearchBeginTime(), param.getSearchEndTime());
if (Objects.nonNull(param.getSearchBeginTime()) && Objects.nonNull(param.getSearchEndTime())) {
queryWrapper.between("A.alarm_time", param.getSearchBeginTime(), param.getSearchEndTime());
}
//监测点id
if (CollUtil.isNotEmpty(lineList)) {
queryWrapper.in("A.line_id", lineList);

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

@@ -160,10 +160,11 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
// quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
// quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id", quitRunningDeviceQueryParam.getDeviceId());
// }
//添加上时间范围
quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime())));
if (Objects.nonNull(quitRunningDeviceQueryParam.getSearchBeginTime()) && Objects.nonNull(quitRunningDeviceQueryParam.getSearchEndTime())) {
quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime())));
}
//判断监测点/设备的选择
quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
if (2 == quitRunningDeviceQueryParam.getDeviceType()) {

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

@@ -226,9 +226,11 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
);
}
//添加上时间范围
queryWrapper.between("supervision_dev_main_report.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchEndTime())));
if (Objects.nonNull(supervisionDevMainReportQuery.getSearchBeginTime()) && Objects.nonNull(supervisionDevMainReportQuery.getSearchEndTime())) {
queryWrapper.between("supervision_dev_main_report.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchEndTime())));
}
queryWrapper.orderByDesc("supervision_dev_main_report.Update_Time");
Page<SupervisionDevMainReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionDevMainReportQuery), PageFactory.getPageSize(supervisionDevMainReportQuery)), queryWrapper);
page.getRecords().forEach(temp -> {

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

@@ -244,9 +244,11 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
);
}
//添加上时间范围
queryWrapper.between("supervision_temp_line_debug.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
if (Objects.nonNull(supervisionTempLineDebugQuery.getSearchBeginTime()) && Objects.nonNull(supervisionTempLineDebugQuery.getSearchEndTime())) {
queryWrapper.between("supervision_temp_line_debug.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
}
queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
}
@@ -271,9 +273,11 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.eq("supervision_temp_line_debug.status", supervisionTempLineDebugQuery.getStatus());
}
//添加上时间范围
queryWrapper.between("supervision_temp_line_debug.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
if (Objects.nonNull(supervisionTempLineDebugQuery.getSearchBeginTime()) && Objects.nonNull(supervisionTempLineDebugQuery.getSearchEndTime())) {
queryWrapper.between("supervision_temp_line_debug.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
}
queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
return this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
}

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

@@ -173,9 +173,11 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
);
}
//添加上时间范围
queryWrapper.between("supervision_temp_line_report.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime())));
if (Objects.nonNull(supervisionTempLineReportQuery.getSearchBeginTime()) && Objects.nonNull(supervisionTempLineReportQuery.getSearchEndTime())) {
queryWrapper.between("supervision_temp_line_report.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime())));
}
queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper);
}

20
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
View File

@@ -130,10 +130,12 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
public Page<WarningLeafletVO> warningPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam) {
QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper = new QueryWrapper<>();
if (Objects.nonNull(warningLeafletQueryParam)) {
//添加上时间范围
warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchEndTime())));
if (Objects.nonNull(warningLeafletQueryParam.getSearchBeginTime()) && Objects.nonNull(warningLeafletQueryParam.getSearchEndTime())) {
//添加上时间范围
warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchEndTime())));
}
}
//筛选负责单位
@@ -336,10 +338,12 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
public Page<WarningLeafletVO> alarmPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam) {
QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper = new QueryWrapper<>();
if (Objects.nonNull(warningLeafletQueryParam)) {
//添加上时间范围
warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchEndTime())));
if (Objects.nonNull(warningLeafletQueryParam.getSearchBeginTime()) && Objects.nonNull(warningLeafletQueryParam.getSearchEndTime())) {
//添加上时间范围
warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchEndTime())));
}
}
warningLeafletVOQueryWrapper
.and(w -> w.in("supervision_warning_leaflet.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(),

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
View File

@@ -81,9 +81,11 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
QueryWrapper<SurveyPlanVO> surveyPlanVOQueryWrapper = new QueryWrapper<>();
if (Objects.nonNull(surveyPlanQueryParam)) {
//添加上时间范围
surveyPlanVOQueryWrapper.and(x -> x.between("supervision_survey_plan.plan_start_time",
DateUtil.beginOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchEndTime()))).or().isNull("supervision_survey_plan.plan_start_time"));
if (Objects.nonNull(surveyPlanQueryParam.getSearchBeginTime()) && Objects.nonNull(surveyPlanQueryParam.getSearchEndTime())) {
surveyPlanVOQueryWrapper.and(x -> x.between("supervision_survey_plan.plan_start_time",
DateUtil.beginOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchEndTime()))).or().isNull("supervision_survey_plan.plan_start_time"));
}
//根据工程名称模糊搜索
if (StrUtil.isNotBlank(surveyPlanQueryParam.getSearchValue())) {
surveyPlanVOQueryWrapper.like("supervision_survey_plan.plan_name", surveyPlanQueryParam.getSearchValue());

17
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
View File

@@ -90,23 +90,24 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
QueryWrapper<SurveyTestVO> surveyTestVOQueryWrapper = new QueryWrapper<>();
List<String> deptIds = new ArrayList<>();
if (Objects.nonNull(surveyTestQueryParam)) {
//添加上时间范围
surveyTestVOQueryWrapper.and(wrapper ->
wrapper.between("supervision_survey_plan.plan_start_time",
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())))
if (Objects.nonNull(surveyTestQueryParam.getSearchBeginTime()) && Objects.nonNull(surveyTestQueryParam.getSearchEndTime())) {
//添加上时间范围
surveyTestVOQueryWrapper.and(wrapper ->
wrapper.between("supervision_survey_plan.plan_start_time",
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())))
.or(x->
//未完成的技术监督计划，也要展示出来，不受时间限制
x.isNull("supervision_survey_test.complete_time")
.le("supervision_survey_plan.plan_start_time", surveyTestQueryParam.getSearchBeginTime())
.le("supervision_survey_plan.plan_start_time", surveyTestQueryParam.getSearchBeginTime())
)
.or(x->
x.between("supervision_survey_test.complete_time",
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())))
)
);
);
}
//根据工程名称模糊搜索
if (Objects.nonNull(surveyTestQueryParam.getSearchValue())) {
LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>();