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)