From 1ff047d803a70faeb5e8e8ad87550102ac39f9bf Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Fri, 21 Feb 2025 17:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=87=8C=E6=99=A8=E6=89=93=E5=8D=A1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataPush/entity/WorkReportBean.java       |  5 +++++
 .../manager/manager/utils/AESCBCUtils.java    |  1 -
 .../mappers/wechatData/WechatDataMapper.xml   | 21 +++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/bonus/boot/manager/dataPush/entity/WorkReportBean.java b/src/main/java/com/bonus/boot/manager/dataPush/entity/WorkReportBean.java
index cc3b1ca..ab258b7 100644
--- a/src/main/java/com/bonus/boot/manager/dataPush/entity/WorkReportBean.java
+++ b/src/main/java/com/bonus/boot/manager/dataPush/entity/WorkReportBean.java
@@ -220,4 +220,9 @@ public class WorkReportBean extends BaseEntity {
      * 审批状态
      */
     private String examineStatus;
+
+    /**
+     * 是否同意
+     */
+    private String isActive;
 }
diff --git a/src/main/java/com/bonus/boot/manager/manager/utils/AESCBCUtils.java b/src/main/java/com/bonus/boot/manager/manager/utils/AESCBCUtils.java
index 584068d..93ba52c 100644
--- a/src/main/java/com/bonus/boot/manager/manager/utils/AESCBCUtils.java
+++ b/src/main/java/com/bonus/boot/manager/manager/utils/AESCBCUtils.java
@@ -111,7 +111,6 @@ public class AESCBCUtils {
                 System.arraycopy(keyBytes, 0, temp, 0, keyBytes.length);
                 keyBytes = temp;
             }
-
             Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM, "BC");
             IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes(ENCODING));
             cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(keyBytes, KEY_ALGORITHM), iv);
diff --git a/src/main/resources/mappers/wechatData/WechatDataMapper.xml b/src/main/resources/mappers/wechatData/WechatDataMapper.xml
index 66b8c5f..d0561ae 100644
--- a/src/main/resources/mappers/wechatData/WechatDataMapper.xml
+++ b/src/main/resources/mappers/wechatData/WechatDataMapper.xml
@@ -36,17 +36,17 @@
         #{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark},#{isPlateau},#{plateauSubsidy})
     </insert>
     <insert id="replaceMonthCheckList">
-        <foreach collection="list" item="it">
+        <foreach collection="list" item="it" separator=";">
             replace into
             leave_check_wechat(id, `month`, org_id, leave_num, out_num, business_trip_num, holiday_num,
-                    att_check_id, att_check_status, att_check_time, att_check_remark, charge_check_id,
-                    charge_check_status, charge_check_time, charge_check_remark, wage_check_id, wage_check_status,
-                    wage_check_time, wage_check_remark, create_time, is_active, status)
+            att_check_id, att_check_status, att_check_time, att_check_remark, charge_check_id,
+            charge_check_status, charge_check_time, charge_check_remark, wage_check_id, wage_check_status,
+            wage_check_time, wage_check_remark, create_time, status)
             values(#{it.id}, #{it.month}, #{it.orgId}, #{it.leaveNum}, #{it.outNum}, #{it.businessTripNum},
             #{it.holidayNum}, #{it.attCheckId}, #{it.attCheckStatus}, #{it.attCheckTime}, #{it.attCheckRemark},
             #{it.chargeCheckId}, #{it.chargeCheckStatus}, #{it.chargeCheckTime}, #{it.chargeCheckRemark},
             #{it.wageCheckId}, #{it.wageCheckStatus}, #{it.wageCheckTime}, #{it.wageCheckRemark}, #{it.createTime},
-            #{it.isActive}, #{it.status})
+            #{it.status})
         </foreach>
     </insert>
 
@@ -88,7 +88,7 @@
 
     <update id="updateWechatLeave">
         update leave_apply_wechat
-        set id     = #{id},
+        set id = #{id},
             org_id = #{orgId}
         where uuid = #{uuid}
     </update>
@@ -120,7 +120,7 @@
             update_user_id   = #{updateUserId},
             update_time      = #{updateTime},
             remark           = #{remark},
-            is_plateau      = #{isPlateau},
+            is_plateau       = #{isPlateau},
             plateau_subsidy  = #{plateauSubsidy}
         WHERE id = #{id};
     </update>
@@ -129,7 +129,6 @@
         update att_source_data_wechat
         set is_outside_att = #{isOutsideAtt}
         where name = #{name}
-          and att_current_day = #{attCurrentDay}
           and att_current_time = #{attCurrentTime}
     </update>
     <update id="updateWechatLeaveListSync">
@@ -141,7 +140,7 @@
     </update>
     <update id="updateWechatIsSync">
         update leave_apply_wechat
-        set is_sync = 0
+        set is_sync = 0,is_update = 0
         where uuid = #{uuid}
     </update>
 
@@ -178,8 +177,8 @@
         select *
         from leave_apply_wechat
         where is_active = '1'
-          and id = #{id}
-          and is_update = #{isUpdate}
+          and (id = #{id}
+            or is_update = #{isUpdate})
     </select>
 
 </mapper>
\ No newline at end of file