From 135321f4a09a21f54ce92639507297a9d57c3b36 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Wed, 10 Jun 2026 09:18:25 +0800
Subject: [PATCH] =?UTF-8?q?pqc=E6=A3=80=E6=B5=8B=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/QmsPqcTaskRecordControllerService.java     | 10 ++++------
 .../common/pojo/qo/QmsPqcTaskRecordTabletSearchQO.java |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
index 56b9e12a..6ea92f46 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
@@ -328,12 +328,10 @@ public class QmsPqcTaskRecordControllerService {
         LambdaQueryWrapper<QmsPqcTaskRecord> queryWrapper = new LambdaQueryWrapper<>();
 
         if (Boolean.TRUE.equals(request.getIsReview())) {
-            queryWrapper.in(QmsPqcTaskRecord::getStatus, (short) 1, (short) 2, (short) 3)
-                    .orderByAsc(QmsPqcTaskRecord::getStatus)
+            queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 3)
                     .orderByDesc(QmsPqcTaskRecord::getCreateTime);
         } else {
-            queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 0)
-                    .isNotNull(QmsPqcTaskRecord::getRelatedTaskId)
+            queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 1)
                     .orderByDesc(QmsPqcTaskRecord::getCreateTime);
         }
 
@@ -1510,7 +1508,7 @@ public class QmsPqcTaskRecordControllerService {
 
         // 5. 推送通知原自检人重新自检
         if (taskRecord.getSelfTesterId() != null) {
-            Long repairTypeId = dictionaryItemService.getId("消息类型", "PQCRepairTask");
+            Long repairTypeId = dictionaryItemService.getIdByCode("MessageType", "PQCRepairTask");
             if (repairTypeId != null) {
                 sendTodoMessage(ticket.getTicketTitle(),taskRecord.getSelfTesterId(), taskRecord.getSelfTesterName(),
                         repairTask.getId(), repairTypeId, currentUserId, currentUserName, now);
@@ -1550,7 +1548,7 @@ public class QmsPqcTaskRecordControllerService {
      */
     private void sendTodoMessageToAllQC(Long taskId, Long createUserId, String createUserName, LocalDateTime now) {
         // 查询消息类型ID
-        Long reviewTypeId = dictionaryItemService.getId("消息类型", "PQCReviewTask");
+        Long reviewTypeId = dictionaryItemService.getIdByCode("MessageType", "PQCReviewTask");
         VUtil.trueThrowBusinessError(reviewTypeId == null).throwMessage("消息类型PQCReviewTask不存在");
 
         // TODO: 根据实际业务获取所有QC人员列表
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordTabletSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordTabletSearchQO.java
index 48c906b0..36daff7e 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordTabletSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordTabletSearchQO.java
@@ -9,7 +9,7 @@ import lombok.Data;
 public class QmsPqcTaskRecordTabletSearchQO {
 
     /**
-     * 是否查询复核任务，true=复核任务，false=返修自检任务
+     * 是否查询已复核任务，true=已复核，false=待复核
      */
     private Boolean isReview;