feat(repository): 新增包装类型名称字段及排序优化

- 在QmsInspectionStandardMapper.xml中关联dictionary_item表以获取包装类型名称
- 将包装类型名称字段di.name加入查询结果及GROUP BY子句
- 修改结果排序方式,优先按启用状态降序,再按ID降序排序
- 在QmsInspectionStandardVO中添加packagingMethodName属性用于存储包装类型名称
This commit is contained in:
曹鹏飞 2026-04-21 14:51:49 +08:00
parent c4f618ad9a
commit 756bfae8d9
2 changed files with 9 additions and 2 deletions

View File

@ -55,6 +55,11 @@ public class QmsInspectionStandardVO {
*/ */
private Long packagingMethodId; private Long packagingMethodId;
/**
* 包装类型名称
*/
private String packagingMethodName;
/** /**
* 启用状态 * 启用状态
*/ */

View File

@ -18,6 +18,7 @@
STRING_AGG(DISTINCT iqe_user.user_name, ',') AS iqeName, STRING_AGG(DISTINCT iqe_user.user_name, ',') AS iqeName,
s.inspection_cycle AS inspectionCycle, s.inspection_cycle AS inspectionCycle,
s.packaging_method_id AS packagingMethodId, s.packaging_method_id AS packagingMethodId,
di.name AS packagingMethodName,
s.is_enabled AS isEnabled, s.is_enabled AS isEnabled,
s.publish_status AS publishStatus, s.publish_status AS publishStatus,
s.publish_user_name AS publishUserName, 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_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 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 "user" iqe_user ON iqe.user_id = iqe_user.id
LEFT JOIN dictionary_item di ON s.packaging_method_id=di.id
<where> <where>
<if test="request.materialNo != null and request.materialNo != ''"> <if test="request.materialNo != null and request.materialNo != ''">
AND m.material_no ilike concat('%', #{request.materialNo}, '%') AND m.material_no ilike concat('%', #{request.materialNo}, '%')
@ -43,9 +45,9 @@
</if> </if>
</where> </where>
GROUP BY s.id, m.material_no, m.material_category_code_path_name, m.material_desc, m.drawing_no_ver, 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 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
</select> </select>
<!-- <!--