From c6264a9d74918acd3fc8cc1e35bbfcd6dfbd0ff7 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 5 Dec 2024 16:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lSun <15893999301@qq.com> --- .../leaveReporting/entity/LeaveReportingBean.java | 1 + .../bonus/system/wechat/entity/WechatEvectionBean.java | 2 +- .../system/wechat/entity/WechatLeaveReportingBean.java | 1 + .../mapper/LeaveReporting/LeaveReportingMapper.xml | 7 +++++-- .../main/resources/mapper/evection/EvectionMapper.xml | 4 ++-- .../resources/mapper/wechat/WechatEvectionMapper.xml | 2 ++ .../mapper/wechat/WechatLeaveReportingMapper.xml | 10 +++++----- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/entity/LeaveReportingBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/entity/LeaveReportingBean.java index 90c3ef1..4c147bb 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/entity/LeaveReportingBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/entity/LeaveReportingBean.java @@ -142,6 +142,7 @@ public class LeaveReportingBean extends BaseBean { * 代理主持工作人员（多个自动隔开） */ private String hostUserId; + private String hostUserName; /** * 地点 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatEvectionBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatEvectionBean.java index 186eb65..f74affc 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatEvectionBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatEvectionBean.java @@ -143,7 +143,7 @@ public class WechatEvectionBean extends BaseBean { * 代理主持工作人员（多个自动隔开） */ private String hostUserId; - + private String hostUserName; /** * 地点 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatLeaveReportingBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatLeaveReportingBean.java index 8697f7b..03035c7 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatLeaveReportingBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/wechat/entity/WechatLeaveReportingBean.java @@ -143,6 +143,7 @@ public class WechatLeaveReportingBean extends BaseBean { * 代理主持工作人员（多个自动隔开） */ private String hostUserId; + private String hostUserName; /** * 地点 diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml index 37a7dfd..e9b497d 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml @@ -7,10 +7,10 @@ INSERT INTO leave_apply(user_id, user_name, org_id, org_name, leave_type, type, leave_reason, leave_start_date, leave_start_interval, leave_end_date, leave_end_interval, - leave_duration, source, create_user_id, is_agree, location, host_user_id, remark,examine_status) + leave_duration, source, create_user_id, is_agree, location, host_user_id,host_user_name, remark,examine_status) VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, '休假报备' , #{type}, #{leaveReason}, #{leaveStartDate}, #{leaveStartInterval}, #{leaveEndDate}, #{leaveEndInterval}, - #{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark},'1') + #{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId},#{hostUserName}, #{remark},'1') @@ -35,6 +35,9 @@ host_user_id = #{hostUserId}, + + host_user_name = #{hostUserName}, + location = #{location}, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml index 41aeb22..d8dcd39 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml @@ -7,11 +7,11 @@ INSERT INTO leave_apply(user_id, user_name, org_id, org_name, leave_type, leave_reason, leave_start_date, leave_start_interval, leave_end_date, leave_end_interval, - leave_duration, source, create_user_id, is_agree, location, host_user_id, remark + leave_duration, source, create_user_id, is_agree, location, host_user_id,host_user_name, remark , leave_form_id, submit_id,examine_status) VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, '出差报备', #{leaveReason}, #{leaveStartDate}, #{leaveStartInterval}, #{leaveEndDate}, #{leaveEndInterval}, - #{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark}, + #{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId},#{hostUserName}, #{remark}, #{uuid}, #{createUserId},'1') diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml index f48b522..fe858e5 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml @@ -94,6 +94,7 @@ l.leave_form_id as uuId, l.submit_id, l.host_user_id, + l.host_user_name, l.is_agree, l.location, l.remark @@ -119,6 +120,7 @@ l.examine_status, l.submit_id, l.host_user_id, + l.host_user_name, l.is_agree, l.location, l.remark diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml index 9c8227e..02d05e0 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatLeaveReportingMapper.xml @@ -74,13 +74,13 @@ l.leave_duration, GROUP_CONCAT(d.dict_label SEPARATOR ', ') AS postName, l.host_user_id, + l.host_user_name as hostUserName, l.is_agree, l.location, - l. remark as remark - FROM - leave_apply l - LEFT JOIN sys_user_post p ON p.user_id = l.user_id - LEFT JOIN sys_dict_data d on d.dict_code = p.post_id + l.remark as remark + FROM leave_apply l + LEFT JOIN sys_user_post p ON p.user_id = l.user_id + LEFT JOIN sys_dict_data d on d.dict_code = p.post_id WHERE l.id = #{id}