From 769b2fa2df24122824b50a9071da9459b50d639a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 9 May 2026 09:31:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8A=BD=E6=A0=B7=E6=96=B9=E6=A1=88=E6=9F=A5=E8=AF=A2=E5=8F=8A?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整抽样方案控制器的查询条件，增加发布时间和时间范围过滤 - 更新抽样方案搜索实体，添加发布状态字段 - 优化入库质检任务控制器的图片ID转换方法，提高代码简洁性 - 在提交数据实体中添加图片列表的校验注解，提升数据有效性验证 - 统一导入语句，简化代码结构 --- .../service/IncomingInspectionTaskControllerService.java | 7 ++----- .../admin/service/QmsSamplingPlanControllerService.java | 5 +++-- ...QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java | 2 ++ .../nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java | 5 +++++ 4 files changed, 12 insertions(+), 7 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 482bba54..d0f3bde1 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 @@ -26,10 +26,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -1103,7 +1100,7 @@ public class IncomingInspectionTaskControllerService { if (StrUtil.isNotBlank(data.getImageIds())) { dataVO.setImages( fileUploadRecordService.lambdaQuery() - .in(FileUploadRecord::getId, StrUtil.split(data.getImageIds(), ",")) + .in(FileUploadRecord::getId, Arrays.stream(StrUtil.splitToLong(data.getImageIds(), ",")).boxed().toList()) .list() .stream() .map(file -> new FileUploadVO() diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java index 5c4018c4..dab4ff1f 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java @@ -392,10 +392,11 @@ public class QmsSamplingPlanControllerService { Page page = new Page<>(request.getPage(), request.getPageSize()); var query = samplingPlanService.lambdaQuery() - .like(StrUtil.isNotBlank(request.getPlanCode()), QmsSamplingPlan::getPlanCode, request.getPlanCode()) - .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName()) + .eq(request.getPublishStatus() != null, QmsSamplingPlan::getPublishStatus, request.getPublishStatus()) .ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate()) .le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate()) + .like(StrUtil.isNotBlank(request.getPlanCode()), QmsSamplingPlan::getPlanCode, request.getPlanCode()) + .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName()) .orderByAsc(QmsSamplingPlan::getPublishStatus) .orderByDesc(QmsSamplingPlan::getId); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java index 0f81f8f9..a8e907a9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java @@ -1,6 +1,7 @@ package com.nflg.wms.common.pojo.qo; import com.nflg.wms.common.pojo.vo.FileUploadVO; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -26,5 +27,6 @@ public class QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO { /** * 图片列表 */ + @Valid private List images; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java index cc099df9..4fce5b71 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java @@ -19,4 +19,9 @@ public class QmsSamplingPlanSearchQO extends SearchBaseQO { * 方案名称 */ private String planName; + + /** + * 发布状态：0-未发布，1-已发布，2-已撤回 + */ + private Short publishStatus; }