数据同步数据,凌晨打卡无法修改问题
This commit is contained in:
parent
779f9adc16
commit
1ff047d803
|
|
@ -220,4 +220,9 @@ public class WorkReportBean extends BaseEntity {
|
|||
* 审批状态
|
||||
*/
|
||||
private String examineStatus;
|
||||
|
||||
/**
|
||||
* 是否同意
|
||||
*/
|
||||
private String isActive;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Loading…
Reference in New Issue