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 2c8adec8..c71222ab 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
@@ -291,7 +291,12 @@ public class QmsIssueTicketControllerService {
                 .set(QmsIssueTicket::getUpdateTime, now)
                 .update();
 
-        issueTicketToDoService.processed(ticket.getId());
+        issueTicketToDoService.lambdaUpdate()
+                .eq(QmsIssueTicketToDo::getTicketId, ticket.getId())
+                .eq(QmsIssueTicketToDo::getHandlerUserId, ticket.getCreateUserId())
+                .eq(QmsIssueTicketToDo::getHasProcessed, false)
+                .set(QmsIssueTicketToDo::getHasProcessed, true)
+                .update();
 
         // 5. 按处理人分组合并不合格项ID
         Map<Long, List<String>> userTaskMap = new LinkedHashMap<>();
@@ -1493,7 +1498,9 @@ public class QmsIssueTicketControllerService {
 
         QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
                 .setTicketId(issueTicketId)
-                .setHandlerUserId(handlerUserId);
+                .setHandlerUserId(handlerUserId)
+                .setHasProcessed(false)
+                .setIsRead(false);
         issueTicketToDoService.save(todoItem);
     }
 
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
index 158337c7..c95c75d8 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
@@ -480,16 +480,26 @@ public class QmsIssueTicketProcessControllerService {
     public void submitPqcHandler(QmsIssueTicketProcessDraftQO request, QmsIssueTicket ticket,
                                  QmsIssueTicketProcess process, LocalDateTime now,
                                  Long currentUserId, String currentUserName) {
-        // 1. 保存数据（调用draftUnified）
-        issueTicketProcessMeasureControllerService.draftUnified(request);
-        QmsIssueTicketProcess latestProcess = issueTicketProcessService.getById(process.getId());
         Short approvalStatus = request.getApprovalStatus() != null
                 ? request.getApprovalStatus()
-                : latestProcess.getApprovalStatus();
+                : process.getApprovalStatus();
         VUtil.trueThrowBusinessError(approvalStatus == null).throwMessage("提交时审批状态不能为空");
         VUtil.trueThrowBusinessError(approvalStatus != 0 && approvalStatus != 1)
                 .throwMessage("不支持的审批状态");
 
+        if (approvalStatus == 0) {
+            // 1. 保存数据（调用draftUnified）
+            issueTicketProcessMeasureControllerService.draftUnified(request);
+        } else {
+            issueTicketProcessService.lambdaUpdate()
+                    .eq(QmsIssueTicketProcess::getId, process.getId())
+                    .set(QmsIssueTicketProcess::getApprovalStatus, approvalStatus)
+                    .set(request.getApprovalOpinion() != null, QmsIssueTicketProcess::getApprovalOpinion, request.getApprovalOpinion())
+                    .set(QmsIssueTicketProcess::getApprovalUserId, currentUserId)
+                    .set(QmsIssueTicketProcess::getApprovalUserName, currentUserName)
+                    .update();
+        }
+
         // 2. 写入审批时间
         issueTicketProcessService.lambdaUpdate()
                 .eq(QmsIssueTicketProcess::getId, process.getId())