From 5612e799112cd1f956e1e1c30cdccd1f2e809896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 26 Aug 2025 17:23:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-627=20=E7=AE=A1=E7=90=86=E7=AB=AFAP?=
 =?UTF-8?q?P=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=BF=99=E9=87=8C=EF=BC=8C=E5=AE=A1=E6=A0=B8=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AA=E5=B7=A5=E5=8D=95=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=98=E6=98=AF=E5=BE=85=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E8=BF=98=E8=83=BD=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E9=87=8D=E5=A4=8D=E5=AE=A1=E6=A0=B8=EF=BC=88?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E5=AE=A1=E6=A0=B8=E5=90=8C=E6=84=8F=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TicketSolutionAudit.java           |  6 ++---
 .../impl/TicketSolutionAuditServiceImpl.java  | 22 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java
index fa18379f..afce820c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java
@@ -1,8 +1,6 @@
 package com.nflg.mobilebroken.repository.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -47,11 +45,13 @@ public class TicketSolutionAudit implements Serializable {
     /**
      * 审核状态，0：不通过；1：通过
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Integer state;
 
     /**
      * 审核不通过的原因
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String reason;
 
     /**
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
index 24819740..0b4abbdf 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
@@ -77,12 +77,12 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
         List<TicketSolutionAudit> forUpdate=new ArrayList<>();
         Ticket ticket=ticketService.getById(request.getTicketId());
         request.getDepartments().forEach(detp->{
-            TicketSolutionAudit audit=new TicketSolutionAudit()
-                    .setTicketId(request.getTicketId())
-                    .setDeptName(detp.getDeptName())
-                    .setUserId(detp.getUserId())
-                    .setCreateTime(LocalDateTime.now());
+            TicketSolutionAudit audit = new TicketSolutionAudit();
             if (Objects.isNull(detp.getId())){
+                audit.setTicketId(request.getTicketId());
+                audit.setDeptName(detp.getDeptName());
+                audit.setUserId(detp.getUserId());
+                audit.setCreateTime(LocalDateTime.now());
                 forAdd.add(audit);
                 VUtils.trueThrowBusinessError(lambdaQuery()
                                 .eq(TicketSolutionAudit::getTicketId, request.getTicketId())
@@ -104,7 +104,8 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
             }else {
                 audit.setId(detp.getId());
                 TicketSolutionAudit entity=getById(detp.getId());
-                if (!Objects.equals(entity.getUserId(), detp.getUserId())){
+                if (!Objects.equals(entity.getUserId(), detp.getUserId()) || Objects.equals(entity.getState(), 0)) {
+                    adminMessageService.remove(0, ticket.getId(), entity.getUserId(), MessageSubType.TicketSolutionAudit.getState());
                     adminMessageService.add(
                             new AdminMessage()
                                     .setNo(ticket.getNo())
@@ -117,7 +118,6 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
                                     .setIsRead(false)
                                     .setCreateTime(LocalDateTime.now())
                     );
-                    adminMessageService.remove(0,ticket.getId(),entity.getUserId(),MessageSubType.TicketSolutionAudit.getState());
                     audit.setState(null);
                     audit.setReason(null);
                 }
@@ -150,7 +150,13 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
                         .eq(TicketSolutionAudit::getUserId, userId)
                         .eq(TicketSolutionAudit::getState, 1)
                         .exists())
-                .throwMessage("已通过后不能再次审核");
+                .throwMessage("请勿重复审核");
+        VUtils.trueThrowBusinessError(lambdaQuery()
+                        .eq(TicketSolutionAudit::getTicketId, request.getTicketId())
+                        .eq(TicketSolutionAudit::getUserId, userId)
+                        .eq(TicketSolutionAudit::getState, 0)
+                        .exists())
+                .throwMessage("请等待CQM修改方案后再审核");
         if(lambdaUpdate()
                 .set(TicketSolutionAudit::getState,0)
                 .set(TicketSolutionAudit::getReason,request.getReason())