diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index 2a2b265..4f431af 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -645,12 +645,19 @@ public class ResultAnalysisController extends BaseController { /** * 缺陷记录(将确认缺陷的数据展示在这) + * @param query 查询条件:点位名称、采集时间范围 * @return */ @GetMapping({"/defect/list"}) - public TableDataInfo defectList() { + public TableDataInfo defectList(DefectRecordQuery query) { ResultAnalysis resultAnalysis = new ResultAnalysis(); resultAnalysis.setPointStatusList(Arrays.asList(PointStatusEnum.CONFIRMED.getCode(), PointStatusEnum.TRACKING.getCode())); + if (query != null) { + resultAnalysis.setPointName(query.getPointName()); + // 采集时间即 patrol_result.create_time(返回字段 patrolTime) + resultAnalysis.setBeginTime(query.getPatrolTimeBegin()); + resultAnalysis.setEndTime(query.getPatrolTimeEnd()); + } // 查出全部数据 List allList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/DefectRecordQuery.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/DefectRecordQuery.java new file mode 100644 index 0000000..871f4c1 --- /dev/null +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/DefectRecordQuery.java @@ -0,0 +1,20 @@ +package com.inspect.analysis.domain; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +/** + * 缺陷记录列表查询条件。 + */ +@Getter +@Setter +@ToString +public class DefectRecordQuery { + /** 点位名称(模糊匹配)。 */ + private String pointName; + /** 采集开始时间(patrol_time 起始日期),格式 yyyy-MM-dd。 */ + private String patrolTimeBegin; + /** 采集结束时间(patrol_time 截止日期),格式 yyyy-MM-dd。 */ + private String patrolTimeEnd; +} diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 641be86..9214b81 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -1561,6 +1561,8 @@ and a.device_name like concat('%', #{pointName}, '%') and d.device_name like concat('%', #{deviceName}, '%') + and a.create_time >= concat(#{beginTime}, ' 00:00:00') + and a.create_time <= concat(#{endTime}, ' 23:59:59') ORDER BY d.device_name,a.device_name ORDER BY b.point_status