巡检bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -140,11 +140,27 @@ public class InputItemController extends AbstractBaseController {
 			resultMap.put(map.get("code"), map.get("name"));
 		}
 		for (InputItemVo inputItemVo : page.getContent()) {
-			String customTypeName = StringUtils.isNotEmpty(inputItemVo.getCustomType())? "自定义巡检点" : "";
+			String finalTypeName = "";
+			finalTypeName = StringUtils.isNotEmpty(inputItemVo.getCustomType())? "自定义巡检点" : "";
 			String keyPartsTypeName = StringUtils.isNotEmpty(inputItemVo.getKeyPartsType())? "重点部位类型" : "";
+			if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(keyPartsTypeName)) {
+				finalTypeName = finalTypeName + "，" + keyPartsTypeName;
+			} else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(keyPartsTypeName)) {
+				finalTypeName = keyPartsTypeName;
+			}
 			String equipmentTypeName = StringUtils.isNotEmpty(inputItemVo.getEquipmentType())? resultMap.get(inputItemVo.getEquipmentType()) : "";
+			if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(equipmentTypeName)) {
+				finalTypeName = finalTypeName + "，" + equipmentTypeName;
+			} else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(equipmentTypeName)) {
+				finalTypeName = equipmentTypeName;
+			}
 			String facilitiesTypeName = StringUtils.isNotEmpty(inputItemVo.getFacilitiesType())? resultMap.get(inputItemVo.getFacilitiesType()) : "";
-			inputItemVo.setTypeName(customTypeName + keyPartsTypeName + equipmentTypeName + facilitiesTypeName);
+			if (StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(facilitiesTypeName)) {
+				finalTypeName = finalTypeName + "，" + facilitiesTypeName;
+			} else if (!StringUtils.isNotEmpty(finalTypeName) && StringUtils.isNotEmpty(facilitiesTypeName)) {
+				finalTypeName = facilitiesTypeName;
+			}
+			inputItemVo.setTypeName(finalTypeName);
 		}
 			return CommonResponseUtil.success(page);
 	}