From 5fac9b8abe76a3337b57527a2796603eb2e1b28a Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Mar 2024 17:59:39 +0800 Subject: [PATCH] =?UTF-8?q?2024-3-13=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/service/impl/EquSpotCheckServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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); }