From f3b3b5a13355f0acbbf4fd85dd82eb5e64c9699a Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Tue, 16 Sep 2025 20:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8D=E5=85=B4=E8=A1=A8=E8=AE=A1=E8=AF=BB?= =?UTF-8?q?=E6=95=B0=E7=BC=BA=E9=99=B7=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E8=AF=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PatrolResultServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index 5abb8d1..33cdc4b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -873,11 +873,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService { if(StringUtils.isBlank(threshold)) { threshold = ""; } - if (threshold.contains("sub_53")) { + if ("1".equals(patrolResultRef.getResultType()) && threshold.contains("sub_53")) { reportData.setInspectionResults(patrolResultRef.getValue()); } - if ((threshold.contains("sub_52") || threshold.contains("sub_53")) + if ("1".equals(patrolResultRef.getResultType()) && (threshold.contains("sub_52") || threshold.contains("sub_53")) && !"0".equals(patrolResultRef.getValue()) && !"1".equals(patrolResultRef.getValue()) && !"-1".equals(patrolResultRef.getValue()) @@ -1415,11 +1415,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService { if(StringUtils.isBlank(threshold)) { threshold = ""; } - if (threshold.contains("sub_53")) { + if ("1".equals(patrolResultRef.getResultType()) && threshold.contains("sub_53")) { reportData.setInspectionResults(patrolResultRef.getValue()); } - if ((threshold.contains("sub_52") || threshold.contains("sub_53")) + if ("1".equals(patrolResultRef.getResultType()) && (threshold.contains("sub_52") || threshold.contains("sub_53")) && !"0".equals(patrolResultRef.getValue()) && !"1".equals(patrolResultRef.getValue()) && !"-1".equals(patrolResultRef.getValue())