From fc43d54bf876417ad5357ca1af52dd5d48b97fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 12 May 2026 14:51:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96IQE=E5=90=8D=E7=A7=B0=E5=8A=9F=E8=83=BD=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QmsInspectionStandardService接口及实现中新增getIQENames方法 - 修改QmsInspectionStandardMapper及Mapper.xml，新增getIQENames查询语句 - 修正SQL中qms_quality_inspector表连接条件错误，确保数据准确 - 在QmsInspectionStandardControllerService中设置iqeName字段，支持展示IQE名称列表 --- .../QmsInspectionStandardControllerService.java | 1 + .../mapper/QmsInspectionStandardMapper.java | 3 +++ .../service/IQmsInspectionStandardService.java | 3 +++ .../impl/QmsInspectionStandardServiceImpl.java | 6 ++++++ .../resources/mapper/QmsInspectionStandardMapper.xml | 11 ++++++++++- 5 files changed, 23 insertions(+), 1 deletion(-) 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 00442ecf..8f549278 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 @@ -200,6 +200,7 @@ public class QmsInspectionStandardControllerService { detail.setUpdateUserId(standard.getUpdateUserId()); detail.setUpdateUserName(standard.getUpdateUserName()); detail.setUpdateTime(standard.getUpdateTime()); + detail.setIqeName(StrUtil.join(",",inspectionStandardService.getIQENames(standard.getId()))); // 填充检测方式、抽样方案、检验水平、AQL相关字段 detail.setTestingMethodDictItemId(standard.getTestingMethodDictItemId()); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectionStandardMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectionStandardMapper.java index 86f7d183..f67e5e62 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectionStandardMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectionStandardMapper.java @@ -10,6 +10,7 @@ import com.nflg.wms.common.pojo.vo.QmsInspectionStandardVO; import com.nflg.wms.repository.entity.QmsInspectionStandard; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; /** @@ -28,4 +29,6 @@ public interface QmsInspectionStandardMapper extends BaseMapper getItemsForCheck(Long id); + + Collection getIQENames(Long id); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionStandardService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionStandardService.java index 3aebac00..9c20b112 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionStandardService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionStandardService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO; import com.nflg.wms.repository.entity.QmsInspectionStandard; +import java.util.Collection; import java.util.List; /** @@ -25,4 +26,6 @@ public interface IQmsInspectionStandardService extends IService getItemsForCheck(Long id); + + Collection getIQENames(Long id); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java index 21518575..9d68d3d2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -115,4 +116,9 @@ public class QmsInspectionStandardServiceImpl extends ServiceImpl getItemsForCheck(Long id) { return baseMapper.getItemsForCheck(id); } + + @Override + public Collection getIQENames(Long id) { + return baseMapper.getIQENames(id); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml index 83240439..29c0cad8 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml @@ -80,7 +80,7 @@ FROM qms_inspection_standard s LEFT JOIN qms_qc_material m ON s.material_id = m.id LEFT JOIN qms_inspector_material_item imi ON imi.material_id = m.id - LEFT JOIN qms_quality_inspector iqe ON m.id = imi.inspector_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 WHERE s.id = #{id} GROUP BY s.id, s.material_id, m.material_no, m.material_category_code_path_name, m.material_desc, m.drawing_no_ver, @@ -106,4 +106,13 @@ INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id" = qisic.inspection_standard_item_id WHERE qisi.inspection_standard_id = #{id} + + From 4daa6983bebe099e2ee9c5480e80438eb7b8deb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 12 May 2026 15:07:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(auth):=20=E8=AE=B0=E5=BD=95=E6=9C=AA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=82=E5=B8=B8=E7=9A=84=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在处理未登录异常的方法中添加错误日志记录 - 记录异常类型以方便问题定位 - 记录异常信息帮助诊断具体原因 - 保持返回 401 状态码和提示信息不变 --- .../com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java index e58bf4b0..7549d7f2 100644 --- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java +++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java @@ -68,6 +68,8 @@ public class GlobalRestControllerAdvice { @ExceptionHandler(NotLoginException.class) @ResponseStatus(HttpStatus.UNAUTHORIZED) // 返回 401 状态码 public String handleNotLoginException(NotLoginException e) { + log.error("未登录异常类型: {}", e.getType()); + log.error("未登录异常信息: {}", e.getMessage()); return "请重新登录"; }