解决归档后的报告中有的字段为空，红外点位初筛结果分析失败，展示成“--”

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -149,6 +149,9 @@ public class ResultAnalysisUtils {
                 resultAnalysis.setResultType("0");
                 defaultDesc = device + messageUtils.get("告警");
             }
+            if (messageUtils.get("分析失败").equals(defaultDesc)) {
+                defaultDesc = "-";
+            }
         } else if (algType.equals("isolator")) {
             if (value.equals("3")) {
                 resultAnalysis.setPointStatus("1");
@@ -177,7 +180,7 @@ public class ResultAnalysisUtils {
                 resultAnalysis.setResultType("0");
                 resultAnalysis.setResStatus("0");
             }
-            if (StringUtils.isNotEmpty(defaultDesc) && defaultDesc.contains("分析失败")) {
+            if (StringUtils.isNotEmpty(defaultDesc) && defaultDesc.contains(messageUtils.get("分析失败"))) {
                 resultAnalysis.setResultType("2");
             }
         }

inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java

@@ -235,6 +235,8 @@ public class MessageUtils {
 					return "summary";
 				case "缺陷":
 					return "defect";
+				case"分析失败":
+					return "analysis failed";
 				default:
 			        return key;
 			}

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

@@ -687,20 +687,20 @@
         where f.main_id = #{mainId}
     </select>
     <select id="selectBaseInfoByMainIds" resultMap="BasePointAreaInfo">
-        select f.device_id,
-               a.patrol_point_id,
-               a.patrol_point_name,
-               b.device_name,
-               c.device_name as main_name,
-               d.area_name   as jg_name,
-               e.area_name
+        select
+            f.device_id,
+            a.patrol_point_id,
+            a.patrol_point_name,
+            b.device_name,
+            c.device_name as main_name,
+            d.area_name as jg_name,
+            e.area_name
         from patrol_result f
-                 left join basedata_patrolpoint a
-                           on f.device_id = a.patrol_point_id OR f.device_name = a.patrol_point_name
-                 left join basedata_device b on a.device_id = b.device_id and b.power_main_equ_flag = "no"
-                 left join basedata_device c on b.parent_id = c.device_id
-                 left join basedata_area d on c.area_id = d.area_id and d.area_type = 'bayunit'
-                 left join basedata_area e on c.area_id = e.area_id
+            left join basedata_patrolpoint a on f.device_id = a.patrol_point_id OR f.device_name = a.patrol_point_name
+            left join basedata_device b on a.device_id = b.device_id and b.power_main_equ_flag = "no"
+            left join basedata_device c on a.main_device_id = c.device_id
+            left join basedata_area d on a.area_id = d.area_id and d.area_type = 'bayunit'
+            left join basedata_area e on d.parent_id = e.area_id
         where f.main_id in
         <foreach collection="mainIds" item="item" index="index" open="(" separator="," close=")">
             #{item}