diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java index 0beead4d..5bc2be14 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java @@ -1,5 +1,6 @@ package com.nflg.qms.admin.service; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -53,6 +54,12 @@ public class QmsInspectionStandardControllerService { @Resource private IDictionaryItemService dictionaryItemService; + @Resource + private IQmsSamplingPlanService samplingPlanService; + + @Resource + private IQmsAqlPriorityValueService aqlPriorityValueService; + /** * 分页查询检验标准 */ @@ -156,7 +163,7 @@ public class QmsInspectionStandardControllerService { detail.setId(standard.getId()); detail.setMaterialId(standard.getMaterialId()); detail.setDrawingUrl(standard.getDrawingUrl()); - detail.setVersionNo(standard.getVersion() != null ? standard.getVersion().toString() : null); + detail.setVersion(standard.getVersion()); detail.setIsEnabled(standard.getIsEnabled()); detail.setPackagingMethodId(standard.getPackagingMethodId()); detail.setInspectionCycle(standard.getInspectionCycle()); @@ -185,12 +192,12 @@ public class QmsInspectionStandardControllerService { dictionaryItemIds.add(item.getSamplingMethodDictItemId()); dictionaryItemIds.add(item.getInspectionLevelDictItemId()); dictionaryItemIds.add(item.getAqlTypeDictItemId()); - dictionaryItemIds.add(item.getAqlPriorityValueId()); - dictionaryItemIds.add(item.getInspectionStandardId()); }); - List dictionaryItems = dictionaryItemService.lambdaQuery() - .in(DictionaryItem::getId, dictionaryItemIds) - .list(); + List dictionaryItems = CollectionUtil.isEmpty(dictionaryItemIds) + ? new ArrayList<>() + : dictionaryItemService.lambdaQuery() + .in(DictionaryItem::getId, dictionaryItemIds) + .list(); for (QmsInspectionStandardItem item : items) { QmsInspectionStandardItemVO itemVO = convertToItemVO(item, dictionaryItems); @@ -235,12 +242,7 @@ public class QmsInspectionStandardControllerService { .orElse(null) ); vo.setSamplingPlanId(item.getSamplingPlanId()); - vo.setSamplingPlanName(dictionaryItems.stream() - .filter(it -> it.getId().equals(item.getSamplingPlanId())) - .findFirst() - .map(DictionaryItem::getName) - .orElse(null) - ); + vo.setSamplingPlanName(samplingPlanService.getById(item.getSamplingPlanId()).getPlanName()); vo.setInspectionLevelDictItemId(item.getInspectionLevelDictItemId()); vo.setInspectionLevelDictItemName(dictionaryItems.stream() .filter(it -> it.getId().equals(item.getInspectionLevelDictItemId())) @@ -249,12 +251,7 @@ public class QmsInspectionStandardControllerService { .orElse(null) ); vo.setAqlPriorityValueId(item.getAqlPriorityValueId()); - vo.setAqlPriorityValueName(dictionaryItems.stream() - .filter(it -> it.getId().equals(item.getAqlPriorityValueId())) - .findFirst() - .map(DictionaryItem::getName) - .orElse(null) - ); + vo.setAqlPriorityValueName(aqlPriorityValueService.getById(item.getAqlPriorityValueId()).getPriorityValue()); vo.setAqlTypeDictItemId(item.getAqlTypeDictItemId()); vo.setAqlTypeDictItemName(dictionaryItems.stream() .filter(it -> it.getId().equals(item.getAqlTypeDictItemId())) @@ -283,6 +280,11 @@ public class QmsInspectionStandardControllerService { vo.setLegend(content.getLegend()); vo.setPdfInfo(content.getPdfInfo()); vo.setJudgmentTypeDictItemId(content.getJudgmentTypeDictItemId()); + vo.setJudgmentTypeDictItemName( + Optional.ofNullable(dictionaryItemService.getById(content.getJudgmentTypeDictItemId())) + .map(DictionaryItem::getName) + .orElse(null) + ); vo.setCreateUserName(content.getCreateUserName()); vo.setCreateTime(content.getCreateTime()); vo.setUpdateUserName(content.getUpdateUserName()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardDetailVO.java index f3442461..6afee328 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardDetailVO.java @@ -49,7 +49,7 @@ public class QmsInspectionStandardDetailVO { /** * 版本号 */ - private String versionNo; + private String version; /** * 是否启用 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemContentVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemContentVO.java index 54c8686a..7784e974 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemContentVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemContentVO.java @@ -45,6 +45,11 @@ public class QmsInspectionStandardItemContentVO { */ private Long judgmentTypeDictItemId; + /** + * 判定类型字典项名称 + */ + private String judgmentTypeDictItemName; + /** * 创建人姓名 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemVO.java index 6f16a1ae..3e952dd3 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardItemVO.java @@ -2,6 +2,7 @@ package com.nflg.wms.common.pojo.vo; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @@ -72,9 +73,9 @@ public class QmsInspectionStandardItemVO { private Long aqlPriorityValueId; /** - * AQL值名称 + * AQL值 */ - private String aqlPriorityValueName; + private BigDecimal aqlPriorityValueName; /** * AQL类型字典项ID diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java index 03873c4d..ee0acbbd 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java @@ -38,7 +38,7 @@ public class QmsInspectionStandardVO { /** * 检测版本号 */ - private String versionNo; + private String version; /** * 所属IQE diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml index 9a3f597c..84931ba6 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml @@ -14,7 +14,7 @@ m.material_category_code_path_name AS materialCategoryCodePathName, m.material_desc AS materialDesc, m.drawing_no_ver AS drawingNoVer, - s.version AS versionNo, + s.version, STRING_AGG(DISTINCT iqe_user.user_name, ',') AS iqeName, s.inspection_cycle AS inspectionCycle, s.packaging_method_id AS packagingMethodId, @@ -60,7 +60,7 @@ m.material_desc AS materialDesc, m.drawing_no_ver AS drawingNoVer, s.drawing_url AS drawingUrl, - s.version AS versionNo, + s.version, s.is_enabled AS isEnabled, s.packaging_method_id AS packagingMethodId, s.inspection_cycle AS inspectionCycle,