Merge branch 'yanyuan' of http://git.ht-atia.cn/qinyanlei/inspect into yanyuan

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java

@@ -647,12 +647,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<PatrolData> allList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
 

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;
+}

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -1564,6 +1564,8 @@
             <if test="pointName != null  and pointName != ''">and a.device_name like concat('%', #{pointName}, '%')</if>
             <if test="deviceName != null  and deviceName != ''">and d.device_name like concat('%', #{deviceName}, '%')
             </if>
+            <if test="beginTime != null and beginTime != ''">and a.create_time &gt;= concat(#{beginTime}, ' 00:00:00')</if>
+            <if test="endTime != null and endTime != ''">and a.create_time &lt;= concat(#{endTime}, ' 23:59:59')</if>
         </where>
         <if test="abnormal == 0">ORDER BY d.device_name,a.device_name</if>
         <if test="abnormal == 1">ORDER BY b.point_status</if>