From d3f412e2cb32665ae7fc1f8a894a86b0b8bb3d62 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 30 Oct 2024 19:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E7=94=B5=E8=83=BD=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/SupervisionTempLineDebugParam.java | 2 +- .../param/leaflet/WarningLeafletParam.java | 1 + .../SupervisionUserComplaintParam.java | 1 + .../pojo/param/survey/SurveyTestParam.java | 1 + .../po/device/TempLineRunTestWarning.java | 7 ++ .../pojo/po/leaflet/WarningLeaflet.java | 8 +- .../problem/SupervisionUserComplaintPO.java | 6 ++ .../pojo/po/survey/SurveyTest.java | 8 ++ .../vo/device/SupervisionTempLineDebugVO.java | 7 ++ .../pojo/vo/leaflet/WarningLeafletVO.java | 2 + .../problem/SupervisionUserComplaintVO.java | 10 ++ .../pojo/vo/survey/SurveyTestVO.java | 9 ++ .../SupervisionTempLineDebugPOMapper.xml | 5 +- .../SupervisionUserComplaintPOMapper.xml | 8 +- .../survey/mapping/SurveyTestMapper.xml | 6 +- ...SupervisionTempLineRunTestServiceImpl.java | 2 + .../impl/LineRunTestProblemServiceImpl.java | 17 +++- .../impl/WarningLeafletServiceImpl.java | 95 +++++++++++++++---- ...SupervisionUserComplaintPOServiceImpl.java | 9 +- .../survey/impl/SurveyPlanServiceImpl.java | 3 + .../survey/impl/SurveyTestServiceImpl.java | 15 ++- 21 files changed, 190 insertions(+), 32 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java index 801339c7d..0e93b82d7 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java @@ -72,7 +72,7 @@ public class SupervisionTempLineDebugParam { private String orgNo; private List statueList; - + private String dealState; /** * 1:审批中；2：审批通过；3：审批不通过；4：已取消 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java index 857e13d2e..85e1ce020 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java @@ -124,6 +124,7 @@ public class WarningLeafletParam implements Serializable{ * 负责单位 */ String deptIndex; + String dealState; /** * 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java index 73e9b9ffb..aeff2f6eb 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java @@ -93,6 +93,7 @@ public class SupervisionUserComplaintParam { * 负责单位 */ String deptIndex; + String dealState; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java index abae1a738..3a7ef6f32 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java @@ -121,6 +121,7 @@ public class SurveyTestParam implements Serializable { */ String deptIndex; + String dealState; /** * 测试审批状态(1:审批中；2：审批通过；3：审批不通过；4：已取消) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java index 7a3937f4b..6834598d7 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java @@ -8,6 +8,7 @@ import java.io.Serializable; import java.util.Date; import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -41,4 +42,10 @@ public class TempLineRunTestWarning extends BaseEntity implements Serializable{ */ @TableField(value = "reason") private String reason; + + /** + * 状态：0-未解决 1-已解决 + */ + @TableField(value = "deal_state") + private Integer dealState; } \ No newline at end of file diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java index 36c0d8b5c..e5613d814 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java @@ -1,7 +1,9 @@ package com.njcn.supervision.pojo.po.leaflet; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -87,7 +89,11 @@ public class WarningLeaflet extends BaseEntity implements Serializable{ */ private String reportPath; - + /** + * 状态：0-未解决 1-已解决 + */ + @TableField(value = "deal_state") + private Integer dealState; /** * 状态：0-删除 1-正常 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java index 7129fda43..fb63fb991 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java @@ -110,6 +110,12 @@ public class SupervisionUserComplaintPO extends BaseEntity { @TableField(value = "initiate_warning_flag") private Integer initiateWarningFlag; + /** + * 状态：0-未解决 1-已解决 + */ + @TableField(value = "deal_state") + private Integer dealState; + /** * 状态：0-删除 1-正常 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java index e022301cf..860f6ada2 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java @@ -107,6 +107,14 @@ public class SurveyTest extends BaseEntity implements Serializable { @TableField(value = "initiate_warning_flag") private Integer initiateWarningFlag; + + /** + * 状态：0-未解决 1-已解决 + */ + @TableField(value = "deal_state") + private Integer dealState; + + /** * 状态：0-删除 1-正常 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java index 76dea1ba1..93445fe95 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java @@ -67,7 +67,14 @@ public class SupervisionTempLineDebugVO extends BaseEntity { @ApiModelProperty(value = "预告警单问题Id") private String problemId; + @ApiModelProperty(value = "状态：0-未解决 1-已解决") + private Integer dealState; + @ApiModelProperty(value = "采取措施") + private String takeStep; + + @ApiModelProperty(value = "处理成效报告") + private String reportPath; public void setTestRunReport(String testRunReport) { if (StrUtil.isNotBlank(testRunReport)) { this.testRunReport = "/" + testRunReport; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java index 299ecbc61..009ac644d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java @@ -123,4 +123,6 @@ public class WarningLeafletVO extends BaseEntity implements Serializable{ @ApiModelProperty("技术监督报告") private String supervisionReport; + + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java index 1e61b0ce1..32f3ec90a 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java @@ -56,4 +56,14 @@ public class SupervisionUserComplaintVO { private String dutyOrgName; + @ApiModelProperty(value = "状态：0-未解决 1-已解决") + private Integer dealState; + + @ApiModelProperty(value = "采取措施") + private String takeStep; + + @ApiModelProperty(value = "处理成效报告") + private String reportPath; + + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java index b55987f47..73ae755b7 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java @@ -149,4 +149,13 @@ public class SurveyTestVO extends BaseEntity implements Serializable { */ private Integer state; + @ApiModelProperty(value = "状态：0-未解决 1-已解决") + private Integer dealState; + + @ApiModelProperty(value = "采取措施") + private String takeStep; + + @ApiModelProperty(value = "处理成效报告") + private String reportPath; + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml index 249589a09..7a478e181 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml @@ -74,7 +74,10 @@ supervision_temp_line_run_test.test_run_time, supervision_temp_line_run_test.create_by, supervision_warning_leaflet.problem_type problemType, - supervision_temp_line_run_test_warning.reason problemReason + supervision_temp_line_run_test_warning.reason problemReason, + supervision_temp_line_run_test_warning.deal_state dealState, + supervision_warning_leaflet.take_step takeStep, + supervision_warning_leaflet.report_path reportPath FROM supervision_temp_line_debug inner JOIN supervision_temp_line_report ON supervision_temp_line_report.id = supervision_temp_line_debug.id diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml index 09ece9586..43de3f677 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml @@ -4,7 +4,11 @@ \ No newline at end of file diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml index b49a0bc29..b37574562 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml @@ -10,10 +10,14 @@ supervision_survey_plan.plan_start_time planStartTime, supervision_survey_plan.supv_type supvType, supervision_survey_plan.supv_object_name supvObjectName, - supervision_survey_plan.plan_end_time planEndTime + supervision_survey_plan.plan_end_time planEndTime, + supervision_warning_leaflet.take_step takeStep, + supervision_warning_leaflet.report_path reportPath FROM supervision_survey_test supervision_survey_test left join supervision_survey_plan supervision_survey_plan on supervision_survey_test.plan_id = supervision_survey_plan.id + left join supervision_warning_leaflet + on supervision_warning_leaflet.problem_id = supervision_survey_test.id WHERE ${ew.sqlSegment} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java index f5f2024f5..5caabe41d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java @@ -20,6 +20,7 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.enums.common.DealStateEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.commApi.CommLineClient; @@ -335,6 +336,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData(); queryWrapper.in("supervision_temp_line_report.org_id", data); } - //添加上时间范围 - queryWrapper.between("supervision_temp_line_run_test_warning.create_time", - DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())), - DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime()))); + //添加上时间范围，如果不是只查询已处理的，时间筛选无效 + if (Objects.nonNull(supervisionTempLineDebugQuery.getSearchBeginTime())&& StringUtils.equals(supervisionTempLineDebugQuery.getDealState(),"1")){ + //添加上时间范围 + queryWrapper.between("supervision_temp_line_run_test_warning.Create_Time", + DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())), + DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime()))); + } + queryWrapper.eq(StringUtils.equals(supervisionTempLineDebugQuery.getDealState(),"0"),"supervision_temp_line_run_test_warning.deal_state",0); +// queryWrapper.between("supervision_temp_line_run_test_warning.create_time", +// DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())), +// DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime()))); queryWrapper.orderByDesc("supervision_temp_line_run_test_warning.create_time"); return lineDebugPOMapper.pageProblem(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index 74fc26354..dfb0a9bc0 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -10,6 +10,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.bpm.api.BpmProcessFeignClient; @@ -20,7 +21,9 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.bpm.pojo.vo.TodoVO; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.enums.common.DealStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.supervision.enums.*; @@ -28,9 +31,13 @@ import com.njcn.supervision.mapper.leaflet.WarningLeafletMapper; import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam; import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning; import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet; +import com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO; +import com.njcn.supervision.pojo.po.survey.SurveyTest; import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO; import com.njcn.supervision.service.device.TempLineRunTestWarningService; import com.njcn.supervision.service.leaflet.IWarningLeafletService; +import com.njcn.supervision.service.problem.SupervisionUserComplaintPOService; +import com.njcn.supervision.service.survey.ISurveyTestService; import com.njcn.supervision.utils.InstanceUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; @@ -47,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -76,32 +84,53 @@ public class WarningLeafletServiceImpl extends ServiceImpl warningPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam) { QueryWrapper warningLeafletVOQueryWrapper = new QueryWrapper<>(); - if (Objects.nonNull(warningLeafletQueryParam)) { + if (Objects.nonNull(warningLeafletQueryParam)&& StringUtils.equals(warningLeafletQueryParam.getDealState(),"1")) { //添加上时间范围 warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time", DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())), @@ -114,6 +143,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl getSupervisionUserComplaint(SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { QueryWrapper supervisionUserComplaintQueryWrapper = new QueryWrapper<>(); - - if (Objects.nonNull(supervisionUserComplaintQueryParam)) { + //如果不是只查询已处理的，时间无效 + if (Objects.nonNull(supervisionUserComplaintQueryParam.getSearchBeginTime())&& StringUtils.equals(supervisionUserComplaintQueryParam.getDealState(),"1")){ //添加上时间范围 supervisionUserComplaintQueryWrapper.between("supervision_user_complaint.Create_Time", DateUtil.beginOfDay(DateUtil.parse(supervisionUserComplaintQueryParam.getSearchBeginTime())), @@ -74,6 +77,8 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl page = this.baseMapper.getPage(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); if (CollUtil.isNotEmpty(page.getRecords())) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index 0028d5273..6e8858e1f 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -18,6 +18,7 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.enums.common.DealStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; @@ -236,6 +237,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl pageProblemSurvey(SurveyTestParam.SurveyTestQueryParam surveyTestQueryParam) { QueryWrapper surveyTestVOQueryWrapper = new QueryWrapper<>(); if (Objects.nonNull(surveyTestQueryParam)) { - //添加上时间范围 - surveyTestVOQueryWrapper.between("supervision_survey_test.create_time", - DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())), - DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime()))); + //如果不是只查询已处理的，时间无效 + if (Objects.nonNull(surveyTestQueryParam.getSearchBeginTime())&& StringUtils.equals(surveyTestQueryParam.getDealState(),"1")){ + //添加上时间范围 + surveyTestVOQueryWrapper.between("supervision_survey_test.Create_Time", + DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())), + DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime()))); + } //根据工程名称模糊搜索 if (StrUtil.isNotBlank(surveyTestQueryParam.getSearchValue())) { LambdaQueryWrapper surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -185,6 +189,8 @@ public class SurveyTestServiceImpl extends ServiceImpl