nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java

@@ -169,7 +169,6 @@ public class QmsIssueTicketControllerService {
                 .setProjectNo(taskRecord.getTaskNo())
                 .setIncidentType(request.getIncidentType())
                 .setIncidentDescription(incidentDescription)
-                .setRemark(request.getRemark())
                 .setUnqualifiedQty((int) unqualifiedCount)
                 .setApprovalStatus((short) 0)
                 .setStatus((short) 0)
@@ -435,7 +434,6 @@ public class QmsIssueTicketControllerService {
                 .setProjectNo(taskRecord.getTaskNo())
                 .setIncidentType(request.getIncidentType())
                 .setIncidentDescription(incidentDescription)
-                .setRemark(request.getRemark())
                 .setUnqualifiedQty((int) unqualifiedCount)
                 .setApprovalStatus((short) 0)
                 .setStatus((short) 0)

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketPdiAddQO.java

@@ -25,12 +25,6 @@ public class QmsIssueTicketPdiAddQO {
     @NotNull(message = "事故类型不能为空")
     private Short incidentType;
 
-    /**
-     * 备注
-     */
-    @NotNull(message = "备注不能为空")
-    private String remark;
-
     /**
      * 处理人列表
      */

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiCreateAndQueryTicketQO.java

@@ -1,8 +1,12 @@
 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新建工单并查询不合格检测项
  */
@@ -22,8 +26,27 @@ public class QmsPdiCreateAndQueryTicketQO {
     private Short incidentType;
 
     /**
-     * 备注
+     * 处理人列表
      */
-    @NotNull(message = "备注不能为空")
+    @Valid
-    private String remark;
+    @NotEmpty(message = "处理人列表不能为空")
+    private List<HandlerItem> 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;
+    }
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketServiceImpl.java

@@ -37,17 +37,10 @@ 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());
+                .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))
-        if (request.getCreateTimeStart() != null) {
+                .orderByDesc(QmsIssueTicket::getCreateTime);
-            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<QmsIssueTicket> result = query.page(page);