diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java index 718e525..7910e81 100644 --- a/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java +++ b/src/main/java/com/bonus/boot/manager/manager/entity/EvectionBean.java @@ -205,4 +205,7 @@ public class EvectionBean { /**是否同步*/ private String isSync; + /**是否因公*/ + private String isBusiness; + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8baa28f..5780019 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,12 +3,12 @@ server.servlet.context-path=/gz_att_wechat spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#˾ +#test spring.datasource.url=jdbc:mysql://192.168.0.14:4418/gz_attendance_wechat?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true spring.datasource.username=root spring.datasource.password=Bonus@admin123! -#ʵ +#prod #spring.datasource.url=jdbc:mysql://127.0.0.1:13306/gz_attendance_wechat?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true #spring.datasource.username=root #spring.datasource.password=Bonus@admin123! diff --git a/src/main/resources/mappers/wechatData/WechatDataMapper.xml b/src/main/resources/mappers/wechatData/WechatDataMapper.xml index 3964977..54d4fce 100644 --- a/src/main/resources/mappers/wechatData/WechatDataMapper.xml +++ b/src/main/resources/mappers/wechatData/WechatDataMapper.xml @@ -20,7 +20,7 @@ leave_end_interval, leave_duration,examine_user_id,examine_opinion,examine_time,examine_status,host_user_id, - host_user_name,is_agree,location,`source`,create_user_id,create_time,update_user_id,update_time,remark,is_plateau,plateau_subsidy,is_active) + host_user_name,is_agree,location,`source`,create_user_id,create_time,update_user_id,update_time,remark,is_plateau,plateau_subsidy,is_active,is_business) values(#{id},#{uuid},#{leaveFormId},#{submitId},#{userId},#{userName},#{orgId},#{type}, #{leaveType},#{leaveReason}, #{leaveStartDate}, @@ -33,7 +33,7 @@ #{leaveDuration},#{examineUserId},#{examineOpinion},#{examineTime}, #{examineStatus},#{hostUserId},#{hostUserName},#{isAgree},#{location},#{source}, - #{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark},#{isPlateau},#{plateauSubsidy},,#{isActive}) + #{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remark},#{isPlateau},#{plateauSubsidy},#{isActive},#{isBusiness}) @@ -122,6 +122,7 @@ remark = #{remark}, is_plateau = #{isPlateau}, plateau_subsidy = #{plateauSubsidy}, + is_business = #{isBusiness}, is_active = #{isActive} WHERE id = #{id};