From 756bfae8d99c83fd9321d663500b9f37cbe1f8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 21 Apr 2026 14:51:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(repository):=20=E6=96=B0=E5=A2=9E=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QmsInspectionStandardMapper.xml中关联dictionary_item表以获取包装类型名称 - 将包装类型名称字段di.name加入查询结果及GROUP BY子句 - 修改结果排序方式，优先按启用状态降序，再按ID降序排序 - 在QmsInspectionStandardVO中添加packagingMethodName属性用于存储包装类型名称 --- .../nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java | 5 +++++ .../main/resources/mapper/QmsInspectionStandardMapper.xml | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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 ee0acbbd..b50a9dbf 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 @@ -55,6 +55,11 @@ public class QmsInspectionStandardVO { */ private Long packagingMethodId; + /** + * 包装类型名称 + */ + private String packagingMethodName; + /** * 启用状态 */ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml index 84931ba6..4f0a15d1 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml @@ -18,6 +18,7 @@ STRING_AGG(DISTINCT iqe_user.user_name, ',') AS iqeName, s.inspection_cycle AS inspectionCycle, s.packaging_method_id AS packagingMethodId, + di.name AS packagingMethodName, s.is_enabled AS isEnabled, s.publish_status AS publishStatus, s.publish_user_name AS publishUserName, @@ -31,6 +32,7 @@ LEFT JOIN qms_inspector_material_item imi ON imi.material_id = m.id LEFT JOIN qms_quality_inspector iqe ON imi.inspector_id = iqe.id AND iqe.inspection_type = 1 AND iqe.enable = true LEFT JOIN "user" iqe_user ON iqe.user_id = iqe_user.id + LEFT JOIN dictionary_item di ON s.packaging_method_id=di.id AND m.material_no ilike concat('%', #{request.materialNo}, '%') @@ -43,9 +45,9 @@ GROUP BY s.id, m.material_no, m.material_category_code_path_name, m.material_desc, m.drawing_no_ver, - s.version, s.inspection_cycle, s.packaging_method_id, s.is_enabled, s.publish_status, + s.version, s.inspection_cycle, s.packaging_method_id, s.is_enabled, s.publish_status,di.name, s.publish_user_name, s.publish_time, s.create_user_name, s.create_time, s.update_user_name, s.update_time - ORDER BY s.id DESC + ORDER BY s.is_enabled DESC,s.id DESC