diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmdReportManagementControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmdReportManagementControllerService.java index 06bc8373..0a1a4276 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmdReportManagementControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmdReportManagementControllerService.java @@ -142,7 +142,7 @@ public class QmdReportManagementControllerService { vo.setPdiComponentId(item.getComponentsId()); vo.setPdiComponentName(component == null ? null : component.getComponentName()); vo.setInspectionItemId(item.getId()); - vo.setInspectionItemName(item.getInspectionContent()); + vo.setInspectionContent(item.getInspectionContent()); vo.setVersions(joinVersions(itemVersionsMap.get(pdiItemKey(item, component)))); return vo; }) @@ -227,7 +227,7 @@ public class QmdReportManagementControllerService { vo.setInspectionPointId(point.getId()); vo.setInspectionPointName(point.getInspectionPointName()); vo.setInspectionItemId(item.getId()); - vo.setInspectionItemName(item.getInspectionContent()); + vo.setInspectionContent(item.getInspectionContent()); vo.setVersions(joinVersions(itemVersionsMap.get(pqcItemKey(point, item)))); return vo; }) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmdReportManagementVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmdReportManagementVO.java index 1659a428..875de5a3 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmdReportManagementVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmdReportManagementVO.java @@ -55,9 +55,9 @@ public class QmdReportManagementVO { private Long inspectionItemId; /** - * 检测项名称 + * 检查内容 */ - private String inspectionItemName; + private String inspectionContent; /** * 有该检测项的版本号 @@ -99,9 +99,9 @@ public class QmdReportManagementVO { private Long inspectionItemId; /** - * 检测项名称 + * 检查内容 */ - private String inspectionItemName; + private String inspectionContent; /** * 有该检测项的版本号