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})
-
+
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})
@@ -88,7 +88,7 @@
update leave_apply_wechat
- set id = #{id},
+ set id = #{id},
org_id = #{orgId}
where uuid = #{uuid}
@@ -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};
@@ -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}
@@ -141,7 +140,7 @@
update leave_apply_wechat
- set is_sync = 0
+ set is_sync = 0,is_update = 0
where uuid = #{uuid}
@@ -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})
\ No newline at end of file