diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java index f8a989d..350e46a 100644 --- a/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java +++ b/src/main/java/com/bonus/boot/manager/manager/entity/HolidayBean.java @@ -148,6 +148,11 @@ public class HolidayBean { */ private String isAgree; + /** + * 是否因公外出 1 是 0 否 + */ + private String isBusiness; + /** * 备注 */ diff --git a/src/main/resources/mappers/wechat/WeChatMapper.xml b/src/main/resources/mappers/wechat/WeChatMapper.xml index 97db983..7b8c7c7 100644 --- a/src/main/resources/mappers/wechat/WeChatMapper.xml +++ b/src/main/resources/mappers/wechat/WeChatMapper.xml @@ -44,14 +44,14 @@ leave_end_date, leave_end_interval, leave_duration, source, create_user_id, is_agree, location, host_user_id, - host_user_name, remark, examine_status,is_update,is_sync) + host_user_name, remark, examine_status,is_update,is_sync,is_business) VALUES (#{uuid}, #{userId}, #{userName}, #{orgId}, #{orgName}, #{leaveType}, #{type}, #{leaveReason}, #{leaveStartDate}, #{leaveStartInterval}, #{leaveEndDate}, #{leaveEndInterval}, #{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{hostUserName}, - #{remark}, '0','0','0') + #{remark}, '0','0','0',#{isBusiness}) @@ -93,6 +93,8 @@ host_user_id = #{hostUserId}, remark = #{remark}, is_update = '1', + is_business = #{isBusiness}, + examine_status = '0' where uuid = #{uuid} @@ -483,7 +485,8 @@ la.host_user_id, la.host_user_name, la.remark, - la.examine_status + la.examine_status, + la.is_business FROM leave_apply_wechat la WHERE la.is_active = '1' and la.uuid = #{uuId}