|
|
|
@ -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()) |
|
|
|
|