From be7d42c1d091533da24500274e0d94e05b231166 Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Sat, 9 May 2026 14:52:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QmsIssueTicket相关部分新增remark字段，支持备注信息存储 - QmsIssueTicketPdiAddQO和QmsPdiCreateAndQueryTicketQO新增备注字段的非空校验 - 修改QmsIssueTicketServiceImpl查询逻辑，调整创建时间范围的条件判断方式 - 在工单创建处设置remark字段，确保备注信息正确传递和保存 - 添加UserUtil导入，为后续用户相关功能准备环境 --- .../QmsIssueTicketControllerService.java | 2 ++ .../QmsPdiTaskRecordControllerService.java | 1 + .../pojo/qo/QmsIssueTicketPdiAddQO.java | 6 ++++ .../pojo/qo/QmsPdiCreateAndQueryTicketQO.java | 29 ++----------------- .../impl/QmsIssueTicketServiceImpl.java | 15 +++++++--- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 17c7013d..28624560 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -169,6 +169,7 @@ public class QmsIssueTicketControllerService { .setProjectNo(taskRecord.getTaskNo()) .setIncidentType(request.getIncidentType()) .setIncidentDescription(incidentDescription) + .setRemark(request.getRemark()) .setUnqualifiedQty((int) unqualifiedCount) .setApprovalStatus((short) 0) .setStatus((short) 0) @@ -434,6 +435,7 @@ public class QmsIssueTicketControllerService { .setProjectNo(taskRecord.getTaskNo()) .setIncidentType(request.getIncidentType()) .setIncidentDescription(incidentDescription) + .setRemark(request.getRemark()) .setUnqualifiedQty((int) unqualifiedCount) .setApprovalStatus((short) 0) .setStatus((short) 0) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java index 6222cb17..b92f9eba 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java @@ -12,6 +12,7 @@ import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDetailVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDefectPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordSummaryVO; +import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.QmsPdiDetectionRules; import com.nflg.wms.repository.entity.QmsPdiDetectionRulesDeliveryItem; import com.nflg.wms.repository.entity.QmsPdiDetectionRulesStatusItem; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketPdiAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketPdiAddQO.java index 14011da9..e37f63fe 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketPdiAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketPdiAddQO.java @@ -25,6 +25,12 @@ public class QmsIssueTicketPdiAddQO { @NotNull(message = "事故类型不能为空") private Short incidentType; + /** + * 备注 + */ + @NotNull(message = "备注不能为空") + private String remark; + /** * 处理人列表 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiCreateAndQueryTicketQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiCreateAndQueryTicketQO.java index 927059c4..42890183 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiCreateAndQueryTicketQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiCreateAndQueryTicketQO.java @@ -1,12 +1,8 @@ package com.nflg.wms.common.pojo.qo; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.util.List; - /** * PDI新建工单并查询不合格检测项 */ @@ -26,27 +22,8 @@ public class QmsPdiCreateAndQueryTicketQO { private Short incidentType; /** - * 处理人列表 + * 备注 */ - @Valid - @NotEmpty(message = "处理人列表不能为空") - private List handlers; - - /** - * 处理人项 - */ - @Data - public static class HandlerItem { - /** - * PDI检测结果ID（qms_pdi_inspection_results.ID） - */ - @NotNull(message = "检测结果ID不能为空") - private Long taskResultId; - - /** - * 处理人用户ID - */ - @NotNull(message = "处理人用户ID不能为空") - private Long handlerUserId; - } + @NotNull(message = "备注不能为空") + private String remark; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketServiceImpl.java index 80e007b5..e01e0402 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketServiceImpl.java @@ -37,10 +37,17 @@ public class QmsIssueTicketServiceImpl .eq(StrUtil.isNotBlank(request.getExceptionCode()), QmsIssueTicket::getExceptionCode, request.getExceptionCode()) .eq(request.getTicketType() != null, QmsIssueTicket::getSourceType, request.getTicketType()) .eq(request.getStatus() != null, QmsIssueTicket::getStatus, request.getStatus()) - .eq(request.getIncidentType() != null, QmsIssueTicket::getIncidentType, request.getIncidentType()) - .ge(request.getCreateTimeStart() != null, QmsIssueTicket::getCreateTime, request.getCreateTimeStart().atStartOfDay()) - .le(request.getCreateTimeEnd() != null, QmsIssueTicket::getCreateTime, request.getCreateTimeEnd().atTime(LocalTime.MAX)) - .orderByDesc(QmsIssueTicket::getCreateTime); + .eq(request.getIncidentType() != null, QmsIssueTicket::getIncidentType, request.getIncidentType()); + + // 处理创建时间范围查询 + if (request.getCreateTimeStart() != null) { + query.ge(QmsIssueTicket::getCreateTime, request.getCreateTimeStart().atStartOfDay()); + } + if (request.getCreateTimeEnd() != null) { + query.le(QmsIssueTicket::getCreateTime, request.getCreateTimeEnd().atTime(LocalTime.MAX)); + } + + query.orderByDesc(QmsIssueTicket::getCreateTime); IPage result = query.page(page);