diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java index 474cba85..a8a8661d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java @@ -123,8 +123,9 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService { * @return */ private AjaxResult formatEquItemCommon(List equPlanEquList, String planType, String message) { + //没有点检项的设备 + String equipmentList = ""; for (EquPlanEqu data : equPlanEquList) { - // 检查项名称临时对象 StringBuilder itemTempName = new StringBuilder(); @@ -169,9 +170,14 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService { data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称(用于前端信息回显) } else { // 未查询到对应检查项信息 - return error(500, message); + equipmentList = equipmentList + '[' + data.getEquipmentCode() + "]"; } } + if(!equipmentList.equals("")){ + equipmentList = equipmentList + "设备未查询到对应检查项信息!"; + message = equipmentList; + return error(500, message); + } return success(equPlanEquList); }