From 54c2e23a321957485910fa50eaa7260cbcb082f8 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 3 Dec 2024 20:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lSun <15893999301@qq.com>
---
 .../main/java/com/bonus/system/att/entity/OrgChangeBean.java  | 4 ++++
 .../com/bonus/system/att/service/OrgChangeServiceImpl.java    | 4 ++--
 .../src/main/resources/mapper/att/OrgChangeMapper.xml         | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
index e27cecf..3d8a4e3 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/OrgChangeBean.java
@@ -121,5 +121,9 @@ public class OrgChangeBean {
      */
     private String endTime;
 
+    /**
+     * 审核意见
+     */
+    private String checkOpinion;
 
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
index 6882403..fc5ac5a 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/OrgChangeServiceImpl.java
@@ -79,9 +79,9 @@ public class OrgChangeServiceImpl implements OrgChangeService {
                 String userName = sysUser.getUserName();
                 String orgName = sysUser.getOrgName();
                 if ("1".equals(o.getIsCheck())) {
-                    o.setRemark("同意 " + orgName + " " + userName + " " + DateUtil.now());
+                    o.setCheckOpinion("同意 " + orgName + " " + userName + " " + DateUtil.now());
                 } else {
-                    o.setRemark("不同意 " + orgName + " " + userName + " " + DateUtil.now());
+                    o.setCheckOpinion("不同意 " + orgName + " " + userName + " " + DateUtil.now());
                 }
                 o.setCheckTime(DateUtil.date());
             } else if (ownStatus.contains(o.getIsCheck())) {
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
index 58276a5..1d2cbc1 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml
@@ -86,7 +86,7 @@
     <update id="updateOrgChange">
         update org_change set user_id = #{userId}, old_org_id = #{oldOrgId}, new_org_id = #{newOrgId},
                               is_change_att_group = #{isChangeAttGroup}, change_effective_date = #{changeEffectiveDate},
-                              is_check = #{isCheck}
+                              is_check = #{isCheck}, remark = #{remark}
         <if test="oldAttGroup != null and oldAttGroup != ''">,old_att_group = #{oldAttGroup}</if>
         <if test="newAttGroup != null and newAttGroup != ''">,new_att_group = #{newAttGroup}</if>
         where id = #{id}
@@ -95,7 +95,7 @@
         update org_change
         <set>
             <if test="checkUserId != 0L">
-                remark = #{remark},
+                check_opinion = #{checkOpinion},
                 check_user_id = #{checkUserId},
                 check_time = #{checkTime},
             </if>