巡检报告查看API优化

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -209,6 +209,9 @@ public interface PlanTaskMapper extends BaseMapper {
 
 	Map<String, Object> getDefectEquipInfo(@Param(value="id") String id);
 
+	List<Map<String, String>> getDefectEquipInfoByIds(@Param(value="ids") List<String> ids);
+
+
 	List<Map<String, Object>> getCheckMissedEquipInfo(@Param(value="taskDetailId") String taskDetailId);
 
 	List<Map<String, Object>> getCheckQualifiedEquipInfo(@Param(value="taskDetailId") String taskDetailId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1960,13 +1960,17 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                         if (x.getDefectEquipmentIds().contains(",")){
                             String[] ids = x.getDefectEquipmentIds().split(",");
                             List<String> equipIds = Arrays.asList(ids);
-                            if (0 < equipIds.size()) {
+                            List<String> collect = equipIds.stream().distinct().collect(Collectors.toList());
+                            List<Map<String, String>> defectEquipInfoByIds = planTaskMapper.getDefectEquipInfoByIds(collect);
+                            Map<String, String> equipLocationMap = defectEquipInfoByIds.stream().collect(Collectors.toMap(t -> t.get("id"), t -> t.get("equipLocation")));
+                            if (CollectionUtils.isNotEmpty(equipIds)) {
                                 for (String s : equipIds) {
-                                    sb.append(planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) == null ? "": planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) .get("equipLocation")).append(",");
+                                    sb.append(!ObjectUtils.isEmpty(equipLocationMap) ? equipLocationMap.getOrDefault(s, "") : "").append(",");
                                 }
                             }
                         }else {
-                            sb.append(planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) == null ? "": planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) .get("equipLocation"));
+                            Map<String, Object> defectEquipInfo = planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds());
+                            sb.append(ObjectUtils.isEmpty(defectEquipInfo) ? "": defectEquipInfo.getOrDefault("equipLocation", ""));
                         }
                     }
                     defectMap.put("defect_equip_position", sb == null ? "" :sb);

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1269,6 +1269,23 @@
 		</where>
 	</select>
 
+	<select id="getDefectEquipInfoByIds" resultType="Map">
+		SELECT
+		es.position AS equipLocation,
+		es.id as id
+		FROM
+		wl_equipment_specific es
+		<where>
+			<if test="ids != null">
+				es.id in
+				<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
+					#{id}
+				</foreach>
+			</if>
+		</where>
+
+	</select>
+
 	<select id="getCheckMissedEquipInfo" resultType="Map">
 		SELECT
 			cl.`name` AS equipName,