小程序打卡数据

Signed-off-by: lSun <15893999301@qq.com>

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;
 
     /**
      * 地点

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;
     /**
      * 地点
      */

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;
 
     /**
      * 地点

bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml

@@ -7,10 +7,10 @@
     <insert id="insertLeaveReporting">
         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')
     </insert>
 
     <update id="updateLeaveReporting">
@@ -35,6 +35,9 @@
             <if test="hostUserId != null and hostUserId != ''">
                 host_user_id = #{hostUserId},
             </if>
+            <if test="hostUserName != null and hostUserName != ''">
+                host_user_name = #{hostUserName},
+            </if>
             <if test="location != null and location != ''">
                 location = #{location},
             </if>

bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml

@@ -7,11 +7,11 @@
     <insert id="insertEvection">
         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')
     </insert>
 

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

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
+               l.remark                                  as remark
-        FROM
+        FROM leave_apply l
-            leave_apply l
+                 LEFT JOIN sys_user_post p ON p.user_id = l.user_id
-                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
-                LEFT JOIN sys_dict_data d on d.dict_code = p.post_id
         WHERE l.id = #{id}
     </select>