feat:绍兴现场缺陷详情弹窗点击忽略/跟踪/确认，任务详情里面点位也同步展示忽略跟踪确认

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

@@ -407,15 +407,22 @@ public class ResultAnalysisController extends BaseController {
             if (!resultAnalysisList.isEmpty()) {
                 ResultAnalysis analysis = resultAnalysisList.get(0);
                 logger.info("[ANALYSIS] lineId: {}", analysis.getLineId());
-                analysis.setResStatus(patrolTaskInfo.getStatus());
+                // 告警确认状态 3-已撤销（忽略） 4-跟踪（告警） 5-确认
+                analysis.setPointStatus(patrolTaskInfo.getStatus());
                 analysis.setSuggestion(patrolTaskInfo.getSuggestion());
-                if ("1".equals(patrolTaskInfo.getStatus())) {
-                    analysis.setResultType("0");//告警
-                } else if ("2".equals(patrolTaskInfo.getStatus())) {
+                if ("5".equals(patrolTaskInfo.getStatus())) {
+                    // 确认
+                    analysis.setResultType("0");//缺陷
+                } else if ("3".equals(patrolTaskInfo.getStatus())) {
+                    // 忽略
                     analysis.setResultType("1");//结果正常
+                } else if ("4".equals(patrolTaskInfo.getStatus())) {
+                    // 跟踪
+                    analysis.setResultType("0");//缺陷
                 }
 
-                resultAnalysisService.updateResultAnalysis(analysis);
+//                resultAnalysisService.updateResultAnalysis(analysis);
+                resultAnalysisService.updateResultAnalysisByCondition(analysis);
             }
         }
 

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/ResultAnalysis.java

@@ -31,6 +31,9 @@ public class ResultAnalysis extends BaseEntity {
     )
     private String resultContent;
     private String resStatus;
+    /**
+     * 点位状态 0-异常 1-正常 2-待人工确认 3-已撤销（忽略） 4-跟踪（告警） 5-确认（告警）
+     */
     private String pointStatus;
     private String beginTime;
     private String endTime;

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java

@@ -81,4 +81,6 @@ public interface ResultAnalysisMapper {
     List<ResultAnalysis> selectResultAnalysisListByMainIdsNew(@Param("lineIds") List<Long> lineIds, @Param("filter") String filter);
 
     List<ResultAnalysis> selectResultAnalysisListBatch(@Param("list") List<String> taskPatrolIds, @Param("resultType") String resultType);
+
+    void updateResultAnalysisByCondition(ResultAnalysis analysis);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java

@@ -57,4 +57,6 @@ public interface IResultAnalysisService {
     List<ResultAnalysis> selectResultAnalysisListBatch(List<String> taskPatrolIds, String resultType);
 
     Long getDefectCountGroupByPoint(String defectFilter, String defectIsToday, String type);
+
+    void updateResultAnalysisByCondition(ResultAnalysis analysis);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java

@@ -98,6 +98,11 @@ public class ResultAnalysisServiceImpl implements IResultAnalysisService {
         return this.resultAnalysisMapper.updateResultAnalysis(resultAnalysis);
     }
 
+    @Override
+    public void updateResultAnalysisByCondition(ResultAnalysis analysis) {
+        this.resultAnalysisMapper.updateResultAnalysisByCondition(analysis);
+    }
+
     public int deleteResultAnalysisByLineIds(Long[] lineIds) {
         return this.resultAnalysisMapper.deleteResultAnalysisByLineIds(lineIds);
     }

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -469,7 +469,17 @@ public class PatrolTaskController extends BaseController {
         newList = new ArrayList<>(keyPatrolData.values());
         if ("1".equals(patrolTaskStatus.getAbnormal())) {
             // 异常置顶
-            newList.sort(Comparator.comparing(PatrolData::getPointStatus));
+            newList.sort(Comparator.comparingInt(obj -> {
+                switch (obj.getPointStatus()) {
+                    case "0": return 1; // 异常
+                    case "5": return 2; // 确认
+                    case "4": return 3; // 跟踪（告警）
+                    case "1": return 4; // 正常
+                    case "2": return 5; // 待人工确认
+                    case "3": return 6; // 已撤销（忽略）
+                    default: return 7;
+                }
+            }));
         }
 
         PageDomain pageDomain = TableSupport.buildPageRequest();
@@ -3275,6 +3285,7 @@ public class PatrolTaskController extends BaseController {
 
             Map<String, String> map1 = new HashMap<>();
             if (!listPointStatus.contains(item.getPointStatus())) {
+                // 点位状态 0-异常 1-正常 2-待人工确认 3-已撤销（忽略） 4-跟踪（告警） 5-确认（告警）
                 if (StringUtils.isNotEmpty(item.getPointStatus())) {
                     if (item.getPointStatus().equals("1")) {
                         map1.put("value", "1");
@@ -3286,6 +3297,26 @@ public class PatrolTaskController extends BaseController {
                         map1.put("label", MessageUtils.get("异常"));
                     }
 
+                    if (item.getPointStatus().equals("2")) {
+                        map1.put("value", "2");
+                        map1.put("label", MessageUtils.get("待人工确认"));
+                    }
+
+                    if (item.getPointStatus().equals("3")) {
+                        map1.put("value", "3");
+                        map1.put("label", MessageUtils.get("忽略"));
+                    }
+
+                    if (item.getPointStatus().equals("4")) {
+                        map1.put("value", "4");
+                        map1.put("label", MessageUtils.get("跟踪"));
+                    }
+
+                    if (item.getPointStatus().equals("5")) {
+                        map1.put("value", "5");
+                        map1.put("label", MessageUtils.get("确认"));
+                    }
+
                     listPointStatus.add(item.getPointStatus());
                     mapList.add(map1);
                 } else {
@@ -3342,6 +3373,26 @@ public class PatrolTaskController extends BaseController {
                     map1.put("label", MessageUtils.get("异常"));
                 }
 
+                if (item.getPointStatus().equals("2")) {
+                    map1.put("value", "2");
+                    map1.put("label", MessageUtils.get("待人工确认"));
+                }
+
+                if (item.getPointStatus().equals("3")) {
+                    map1.put("value", "3");
+                    map1.put("label", MessageUtils.get("忽略"));
+                }
+
+                if (item.getPointStatus().equals("4")) {
+                    map1.put("value", "4");
+                    map1.put("label", MessageUtils.get("跟踪"));
+                }
+
+                if (item.getPointStatus().equals("5")) {
+                    map1.put("value", "5");
+                    map1.put("label", MessageUtils.get("确认"));
+                }
+
                 listPointStatus.add(item.getPointStatus());
                 mapList.add(map1);
             }

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

@@ -407,6 +407,35 @@
         </trim>
         where line_id = #{lineId}
     </update>
+    <update id="updateResultAnalysisByCondition">
+        update result_analysis
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="resultType != null">result_type = #{resultType},</if>
+            <if test="businessId != null">business_id = #{businessId},</if>
+            <if test="resultContent != null">result_content = #{resultContent},</if>
+            <if test="resStatus != null">res_status = #{resStatus},</if>
+            <if test="pointStatus != null">point_status = #{pointStatus},</if>
+            <if test="objectId != null">objectId = #{objectId},</if>
+            <if test="suggestion != null">suggestion = #{suggestion},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="requestId != null">request_id = #{requestId},</if>
+            <if test="taskPatrolId != null">task_patrol_id  = #{taskPatrolId},</if>
+            <if test="algType != null">alg_type = #{algType},</if>
+            <if test="resValue != null">res_value = #{resValue},</if>
+            <if test="resCode != null">res_code = #{resCode},</if>
+            <if test="resConf != null">res_conf = #{resConf},</if>
+            <if test="resDesc != null">res_desc = #{resDesc},</if>
+            <if test="result != null">result = #{result},</if>
+            <if test="resImgUrl != null">res_img_url = #{resImgUrl},</if>
+            <if test="imageNormalUrlPath != null">image_normal_url_path = #{imageNormalUrlPath},</if>
+            <if test="resPos != null">res_pos = #{resPos},</if>
+            <if test="filter != null">filter = #{filter},</if>
+            <if test="originalValue != null">original_value = #{originalValue},</if>
+        </trim>
+            <where>
+                objectId = #{objectId} and alg_type = #{algType} and task_patrol_id  = #{taskPatrolId}
+            </where>
+    </update>
 
     <delete id="deleteResultAnalysisByLineId" parameterType="Long">
         delete