From 261f2ee25799de96bb615de1063a1d868c28ab72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 10 Jun 2026 15:06:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor(inspection):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=91=98=E8=BD=AC=E5=8A=9E=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 使用 getById 替代复杂查询条件简化代码 - 移除冗余的检查条件提高性能 - 更新数据库关联关系确保数据一致性 - 调整实体类注释描述以匹配实际用途 --- .../IncomingInspectionTaskControllerService.java | 14 ++------------ .../wms/repository/entity/QmsQualityInspector.java | 2 +- .../resources/mapper/QmsQualityInspectorMapper.xml | 3 ++- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index f4f27ec5..c475a730 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -164,12 +164,7 @@ public class IncomingInspectionTaskControllerService { User inspectorUser; if (Objects.nonNull(inspector.getChangeUserId())) { // 转办人是 user.id，需查询对应的 qms_quality_inspector 记录 - QmsQualityInspector agentInspector = qualityInspectorService.lambdaQuery() - .eq(QmsQualityInspector::getUserId, inspector.getChangeUserId()) - .eq(QmsQualityInspector::getInspectionType, 1) - .eq(QmsQualityInspector::getEnable, true) - .last("LIMIT 1") - .one(); + QmsQualityInspector agentInspector = qualityInspectorService.getById(inspector.getChangeUserId()); if (Objects.nonNull(agentInspector)) { inspectorId = agentInspector.getId(); inspectorUser = userService.getById(agentInspector.getUserId()); @@ -313,12 +308,7 @@ public class IncomingInspectionTaskControllerService { String inspectorName; User inspectorUser; if (Objects.nonNull(inspector.getChangeUserId())) { - QmsQualityInspector agentInspector = qualityInspectorService.lambdaQuery() - .eq(QmsQualityInspector::getUserId, inspector.getChangeUserId()) - .eq(QmsQualityInspector::getInspectionType, 1) - .eq(QmsQualityInspector::getEnable, true) - .last("LIMIT 1") - .one(); + QmsQualityInspector agentInspector = qualityInspectorService.getById(inspector.getChangeUserId()); if (Objects.nonNull(agentInspector)) { inspectorId = agentInspector.getId(); inspectorUser = userService.getById(agentInspector.getUserId()); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityInspector.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityInspector.java index 7382364a..b59c7753 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityInspector.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityInspector.java @@ -47,7 +47,7 @@ public class QmsQualityInspector implements Serializable { private Integer inspectionType; /** - * 转办人ID (user.id)，可为空 + * 转办人ID可为空 */ private Long changeUserId; diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml index ca087b56..6aad2725 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml @@ -30,7 +30,8 @@ LEFT JOIN "user" u ON u.id = qi.user_id LEFT JOIN user_interior ui ON ui.user_id = qi.user_id LEFT JOIN department d ON d.id = ui.dept_id - LEFT JOIN "user" cu ON cu.id = qi.change_user_id + LEFT JOIN qms_quality_inspector cqi ON cqi.id = qi.change_user_id + LEFT JOIN "user" cu ON cu.id = cqi.user_id AND u.user_code = #{request.userCode}