feat(qms): 添加备注字段并优化查询逻辑

- 在QmsIssueTicket相关部分新增remark字段，支持备注信息存储
- QmsIssueTicketPdiAddQO和QmsPdiCreateAndQueryTicketQO新增备注字段的非空校验
- 修改QmsIssueTicketServiceImpl查询逻辑，调整创建时间范围的条件判断方式
- 在工单创建处设置remark字段，确保备注信息正确传递和保存
- 添加UserUtil导入，为后续用户相关功能准备环境

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)

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;

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;
+
     /**
      * 处理人列表
      */

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
+    @NotNull(message = "备注不能为空")
-    @NotEmpty(message = "处理人列表不能为空")
+    private String remark;
-    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,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())
+                .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);
+        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<QmsIssueTicket> result = query.page(page);