From d10ee39ef95eb2442902e36dd36b1683cbd10af6 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 06 三月 2025 15:10:03 +0800 Subject: [PATCH] art: 项目性维修-详情页面-附件,设备状态,技术状态不展示问题修改, 设备选择过滤,只能选择用户范围内的设备信息 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java index 6be2495..c8459af 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java @@ -155,6 +155,22 @@ streamService.save(stream); List<ABCAssessment> abcAssessmentList = stream.getAssessmentList(); for(ABCAssessment abcAssessment:abcAssessmentList){ + Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId()); + boolean isD = "D".equals(abcAssessment.getFinalStandard()); + boolean a = StringUtils.isNotBlank(equipment.getStandardA())&&StringUtils.isNotBlank(abcAssessment.getStandardA())&&equipment.getStandardA().equals(abcAssessment.getStandardA()); + boolean b = StringUtils.isNotBlank(equipment.getStandardB())&&StringUtils.isNotBlank(abcAssessment.getStandardB())&&equipment.getStandardB().equals(abcAssessment.getStandardB()); + boolean c = StringUtils.isNotBlank(equipment.getStandardC())&&StringUtils.isNotBlank(abcAssessment.getStandardC())&&equipment.getStandardC().equals(abcAssessment.getStandardC()); + boolean d = StringUtils.isNotBlank(equipment.getStandardD())&&StringUtils.isNotBlank(abcAssessment.getStandardD())&&equipment.getStandardD().equals(abcAssessment.getStandardD()); + boolean e = StringUtils.isNotBlank(equipment.getStandardE())&&StringUtils.isNotBlank(abcAssessment.getStandardE())&&equipment.getStandardE().equals(abcAssessment.getStandardE()); + boolean f = StringUtils.isNotBlank(equipment.getStandardF())&&StringUtils.isNotBlank(abcAssessment.getStandardF())&&equipment.getStandardF().equals(abcAssessment.getStandardF()); + if(isD&&a&&b&&c&&d&&e&&f){ + abcAssessment.setStandardA(null); + abcAssessment.setStandardB(null); + abcAssessment.setStandardC(null); + abcAssessment.setStandardD(null); + abcAssessment.setStandardE(null); + abcAssessment.setStandardF(null); + } abcAssessment.setStreamId(stream.getId()); } aBCAssessmentService.saveBatch(abcAssessmentList); -- Gitblit v1.9.3