From 6fe077690884e48d150e1b7f5e998cdb6ae37eb8 Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Fri, 19 Nov 2021 16:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/service/ActTaskDefService.java   | 2 +-
 .../resources/templates/admin/project_task_record_list.ftl    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ActTaskDefService.java b/src/main/java/cn/palmte/work/service/ActTaskDefService.java
index 78c58a2..375153b 100644
--- a/src/main/java/cn/palmte/work/service/ActTaskDefService.java
+++ b/src/main/java/cn/palmte/work/service/ActTaskDefService.java
@@ -245,7 +245,7 @@ public class ActTaskDefService {
             }
 
             if (StringUtils.isNotBlank(actHisTask.getDeleteReason())) {
-                actHisTask.setComments("【驳回】" + actHisTask.getComments());
+                actHisTask.setComments("【审核不通过】" + actHisTask.getComments());
             }
         }
 
diff --git a/src/main/resources/templates/admin/project_task_record_list.ftl b/src/main/resources/templates/admin/project_task_record_list.ftl
index 00413ad..15b1ca2 100644
--- a/src/main/resources/templates/admin/project_task_record_list.ftl
+++ b/src/main/resources/templates/admin/project_task_record_list.ftl
@@ -28,8 +28,8 @@
                                             <span></span>
                                         </div>
                                         <div class="time-axis-title"> ${node.roleName}-${node.assigneeName}:
-                                            <#if node.taskIndex!=2 && node.taskStatus==2>审批通过</#if>
-                                            <#if node.taskIndex!=2 && node.taskStatus==3>审批不通过</#if>
+                                            <#if node.taskIndex!=2 && node.taskStatus==2>审核通过</#if>
+                                            <#if node.taskIndex!=2 && node.taskStatus==3>审核不通过</#if>
                                         </div>
                                         <div class="time-axis-title">
                                             ${node.taskComment}