修改巡检bug

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

@@ -1944,15 +1944,21 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                     defectMap.put("defect_num", x.getDefectNum());
                     defectMap.put("defect_level", DefectLevelEnum.getByKey(x.getDefectLevel()).getValue());
                     defectMap.put("defect_equip_name", x.getDefectEquipmentName());
-                    String[] ids = x.getDefectEquipmentIds().split(",");
-                    List<String> equipIds = Arrays.asList(ids);
                     StringBuffer sb = new StringBuffer();
-                    if (0 < equipIds.size()) {
-                        for (String s : equipIds) {
-                            sb.append(planTaskMapper.getDefectEquipInfo(s).get("equipLocation")).append(",");
+                    if (!StringUtils.isEmpty(x.getDefectEquipmentIds())){
+                        if (x.getDefectEquipmentIds().contains(",")){
+                            String[] ids = x.getDefectEquipmentIds().split(",");
+                            List<String> equipIds = Arrays.asList(ids);
+                            if (0 < equipIds.size()) {
+                                for (String s : equipIds) {
+                                    sb.append(planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) == null ? "": planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) .get("equipLocation")).append(",");
+                                }
+                            }
+                        }else {
+                            sb.append(planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) == null ? "": planTaskMapper.getDefectEquipInfo(x.getDefectEquipmentIds()) .get("equipLocation"));
                         }
                     }
-                    defectMap.put("defect_equip_position", sb.length() > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "");
+                    defectMap.put("defect_equip_position", sb == null ? "" :sb);
                     defectMap.put("defect_equip_describe", x.getDefectDescribe());
                     defectMap.put("defect_report_time", sdf.format(x.getAddTime()));
                     defectMap.put("defect_discovery_name", x.getDefectDiscover());

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

@@ -1172,8 +1172,6 @@
 			<if test="param.routeId != null"> and ppk.route_id = #{param.routeId} </if>
 			<if test="param.bizOrgCode != null"> and pp.biz_org_code like concat('%',#{param.bizOrgCode},'%')  </if>
 		</where>
-		ORDER BY
-			ppk.begin_time DESC
 	</select>
 
 	<select id="planTaskPage" resultType="java.util.HashMap">