diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index d772caf8..5d12ffc3 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -1005,7 +1005,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { diffEquipmentField(details, changeId, prefix, "校准初始值", oldE.getCalibrationInitValue(), newE.getCalibrationInitValue()); diffEquipmentField(details, changeId, prefix, "现场校验类型编码", oldE.getFieldCalibrationTypeCode(), newE.getFieldCalibrationTypeCode()); diffEquipmentField(details, changeId, prefix, "现场校验类型名称", oldE.getFieldCalibrationTypeName(), newE.getFieldCalibrationTypeName()); - diffEquipmentField(details, changeId, prefix, "是否双路", oldE.getDualChannelFlag(), newE.getDualChannelFlag()); + diffEquipmentField(details, changeId, prefix, "是否双路", oldE.getDualChannelFlag() == 1 ? "是" : "否", newE.getDualChannelFlag() == 1 ? "是" : "否"); diffEquipmentField(details, changeId, prefix, "计量检定报告地址", oldE.getCalibrationReportUrl(), newE.getCalibrationReportUrl()); } return details; @@ -1095,6 +1095,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { return before != null && after != null && before.compareTo(after) == 0; } + /** * 通用值比较:BigDecimal 走 compareTo 忽略 scale 差异,其余走 Objects.equals */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java index a370fe47..4a339795 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java @@ -93,7 +93,7 @@ public class QualFilingEquipmentChangeE extends BaseE { /** * 是否双路(1是2否) */ - private Long dualChannelFlag; + private Integer dualChannelFlag; /** * 计量检定报告地址 */