From d5cee2a8f8562185ce68d6fe6befd3abbd8a840a Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 1 Apr 2024 16:36:53 +0800 Subject: [PATCH] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97-=E7=82=B9=E6=A3=80=E5=B7=A1=E6=A3=80-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8E=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/device/service/impl/EquPlanServiceImpl.java | 11 +++++++++-- .../device/service/impl/EquSpotCheckServiceImpl.java | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 30a96536..96df2cc7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -506,6 +506,7 @@ public class EquPlanServiceImpl implements IEquPlanService { * @return */ private AjaxResult formatEquItemCommon(List equPlanEquList, String planType, String message) { + String equipmentList = ""; for (EquPlanEqu data : equPlanEquList) { // 检查项名称临时对象 @@ -552,10 +553,16 @@ public class EquPlanServiceImpl implements IEquPlanService { data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称（用于前端信息回显） } else { // 未查询到对应检查项信息 - return error(500, message); + equipmentList = equipmentList + '[' + data.getEquipmentCode() + "]"; } } - return success(equPlanEquList); + if(!equipmentList.equals("")){ + equipmentList = equipmentList + "设备未查询到对应检查项信息!"; + message = equipmentList; + return error(500, message); + }else{ + return success(equPlanEquList); + } } /** 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 a8a8661d..5917c45e 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 @@ -177,8 +177,9 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService { equipmentList = equipmentList + "设备未查询到对应检查项信息!"; message = equipmentList; return error(500, message); + }else{ + return success(equPlanEquList); } - return success(equPlanEquList); } }