From dc490c5a8ac9608e38a4b29dca1838c2962f3b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 9 Jun 2026 14:38:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E5=A2=9E=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E6=A3=80=E9=AA=8C=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增代理ID查询条件支持，允许代理人查看相关检验任务 - 添加检验标准项类型的最小值和最大值校验注解 - 完善数据验证规则确保检验标准项类型在有效范围内 --- .../nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java | 5 +++++ .../service/impl/QmsIncomingInspectionTaskServiceImpl.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java index 94274c24..78960012 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java @@ -1,9 +1,12 @@ package com.nflg.qms.admin.pojo.qo; import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; +import org.checkerframework.checker.units.qual.min; import java.util.List; @@ -112,6 +115,8 @@ public class QmsInspectionStandardSaveQO { * 检验标准项类型：0-标准检测项，1-尺寸检测项 */ @NotNull(message = "检验标准项类型不能为空") + @Min(value = 0, message = "检验标准项类型不能小于0") + @Max(value = 1, message = "检验标准项类型不能大于1") private Short itemType; /** diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java index 6f882677..c56daa6c 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java @@ -40,7 +40,10 @@ public class QmsIncomingInspectionTaskServiceImpl extends ServiceImpl list = lambdaQuery() .select(QmsIncomingInspectionTask::getInspectionStatus, QmsIncomingInspectionTask::getIsOverdue) - .eq(QmsIncomingInspectionTask::getInspectorId, inspectorId) + .and(a -> a.eq(QmsIncomingInspectionTask::getInspectorId, inspectorId) + .or() + .eq(QmsIncomingInspectionTask::getAgentId, inspectorId) + ) .list(); // 待检验数量（检验状态=0）