Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/activity/ZxActivityController.java

@@ -104,6 +104,15 @@ public class ZxActivityController extends BaseController {
     public AjaxResult updateReply(@RequestBody ZxActivityUser zxActivityUser) {
         return success(zxActivityService.updateReply(zxActivityUser));
     }
+
+    /**
+     * 修改请假审批
+     */
+    @PreAuthorize("@ss.hasPermi('zxActivity:activity:updateApproval')")
+    @PostMapping(value = "/updateApproval")
+    public AjaxResult updateApproval(@RequestBody ZxActivityUser zxActivityUser) {
+        return success(zxActivityService.updateApproval(zxActivityUser));
+    }
     /**
      * 修改政协活动
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ZxConferenceController.java

@@ -94,6 +94,14 @@ public class ZxConferenceController extends BaseController {
         return success(zxConferenceService.updateReply(zxConferenceUser));
     }
 
+    /**
+     * 修改请假审批
+     */
+    @PreAuthorize("@ss.hasPermi('zxConference:conference:updateApproval')")
+    @PostMapping(value = "/updateApproval")
+    public AjaxResult updateApproval(@RequestBody ZxConferenceUser zxConferenceUser) {
+        return success(zxConferenceService.updateApproval(zxConferenceUser));
+    }
     /**
      * 会议签到
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/activity/ZxActivityUser.java

@@ -65,6 +65,19 @@ public class ZxActivityUser extends BaseEntity
     @Excel(name = "签到时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date signIn;
 
+    /**
+     * 是否审批 1：待审批 2：已同意 3：未同意
+     */
+    private String approval;
+
+    public String getApproval() {
+        return approval;
+    }
+
+    public void setApproval(String approval) {
+        this.approval = approval;
+    }
+
     public String getParentGrade() {
         return parentGrade;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/conference/ZxConferenceUser.java

@@ -65,6 +65,18 @@ public class ZxConferenceUser extends BaseEntity
     /** 请假原因 */
     @Excel(name = "请假原因")
     private String leaveReason;
+    /**
+     * 是否审批 1：待审批 2：已同意 3：未同意
+     */
+    private String approval;
+
+    public String getApproval() {
+        return approval;
+    }
+
+    public void setApproval(String approval) {
+        this.approval = approval;
+    }
 
     public String getParentGrade() {
         return parentGrade;

ruoyi-system/src/main/java/com/ruoyi/system/service/IZxActivityService.java

@@ -55,6 +55,10 @@ public interface IZxActivityService
      * 修改活动答复信息
      */
     public int updateReply(ZxActivityUser zxActivityUser);
+    /**
+     * 修改请假审批
+     */
+    public int updateApproval(ZxActivityUser zxActivityUser);
 
     /**
      * 修改政协活动

ruoyi-system/src/main/java/com/ruoyi/system/service/IZxConferenceService.java

@@ -59,6 +59,10 @@ public interface IZxConferenceService
      * 修改会议答复信息
      */
     public int updateReply(ZxConferenceUser zxConferenceUser);
+    /**
+     * 修改请假审批
+     */
+    public int updateApproval(ZxConferenceUser zxConferenceUser);
 
     /**
      * 会议签到

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxActivityServiceImpl.java

@@ -152,6 +152,14 @@ public class ZxActivityServiceImpl implements IZxActivityService {
         return zxActivityMapper.updateReply(zxActivityUser);
     }
 
+    /**
+     * 修改请假审批
+     */
+    @Override
+    public int updateApproval(ZxActivityUser zxActivityUser) {
+        return zxActivityMapper.updateReply(zxActivityUser);
+    }
+
     /**
      * 修改政协活动
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxConferenceServiceImpl.java

@@ -156,6 +156,14 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
         return zxConferenceMapper.updateReply(zxConferenceUser);
     }
 
+    /**
+     * 修改请假审批
+     */
+    @Override
+    public int updateApproval(ZxConferenceUser zxConferenceUser) {
+        return zxConferenceMapper.updateReply(zxConferenceUser);
+    }
+
     /**
      * 会议签到
      * @param zxConferenceUser

ruoyi-system/src/main/resources/mapper/system/ZxActivityMapper.xml

@@ -41,6 +41,7 @@
         <result property="isJoin" column="sub_is_join"/>
         <result property="leaveType" column="sub_leave_type"/>
         <result property="leaveReason" column="sub_leave_reason"/>
+        <result property="approval"    column="sub_approval"    />
         <result property="signIn" column="sub_sign_in"/>
         <result property="createBy" column="sub_create_by"/>
         <result property="createTime" column="sub_create_time"/>
@@ -83,7 +84,7 @@
         select a.activity_id, a.activity_title, a.activity_date, a.activity_time, a.activity_address, a.activity_type,
         a.activity_details, a.publish_time, a.publish_dept, a.publish_dept_id, a.create_by, a.create_time, a.update_by,
         a.update_time, a.remark,
-        b.activity_id as sub_activity_id,b.phonenumber as sub_phonenumber, b.parent_grade as sub_parent_grade,b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
+        b.activity_id as sub_activity_id,b.approval as sub_approval,b.phonenumber as sub_phonenumber, b.parent_grade as sub_parent_grade,b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
         sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
         b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
         sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time,
@@ -137,6 +138,7 @@
                b.is_join      as sub_is_join,
                b.leave_type   as sub_leave_type,
                b.leave_reason as sub_leave_reason,
+               b.approval     as sub_approval,
                b.sign_in      as sub_sign_in,
                b.create_by    as sub_create_by,
                b.create_time  as sub_create_time,
@@ -165,6 +167,7 @@
                b.is_join      as sub_is_join,
                b.leave_type   as sub_leave_type,
                b.leave_reason as sub_leave_reason,
+               b.approval     as sub_approval,
                b.sign_in      as sub_sign_in,
                b.create_by    as sub_create_by,
                b.create_time  as sub_create_time,
@@ -176,7 +179,7 @@
     </select>
     <select id="selectZxActivityUser" resultMap="ZxActivityUserResult">
         select b.activity_id as sub_activity_id, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
-        sub_post_name, b.user_level as sub_user_level,b.parent_grade as sub_parent_grade, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
+        sub_post_name, b.user_level as sub_user_level,b.approval as sub_approval,b.parent_grade as sub_parent_grade, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
         b.leave_type as sub_leave_type,b.phonenumber as sub_phonenumber, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
         sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time,
         b.remark as sub_remark
@@ -191,7 +194,7 @@
         a.activity_details, a.publish_time, a.publish_dept, a.publish_dept_id, a.create_by, a.create_time, a.update_by,
         a.update_time, a.remark,
         b.activity_id as sub_activity_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
-        sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
+        sub_post_name, b.user_level as sub_user_level,b.approval as sub_approval, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
         b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
         sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time,
         b.remark as sub_remark
@@ -267,6 +270,7 @@
             <if test="leaveType != null and leaveType != ''">leave_type = #{leaveType},</if>
             <if test="leaveReason != null and leaveReason != ''">leave_reason = #{leaveReason},</if>
             <if test="signIn != null and signIn != ''">sign_in = #{signIn},</if>
+            <if test="approval != null and approval != ''">approval = #{approval},</if>
         </trim>
         where activity_id = #{activityId} and user_id = #{userId}
     </update>
@@ -299,10 +303,10 @@
 
     <insert id="batchZxActivityUser">
         insert into zx_activity_user( activity_id, user_id, user_name, phonenumber ,post_name, user_level, reply_time, is_join,
-        leave_type,parent_grade, leave_reason, sign_in, create_by, create_time, update_by, update_time, remark) values
+        leave_type,parent_grade, leave_reason,approval, sign_in, create_by, create_time, update_by, update_time, remark) values
         <foreach item="item" index="index" collection="list" separator=",">
             ( #{item.activityId}, #{item.userId}, #{item.userName}, #{item.phonenumber},#{item.postName}, #{item.userLevel},
-            #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason}, #{item.signIn}, #{item.createBy},
+            #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason},#{item.approval}, #{item.signIn}, #{item.createBy},
             #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>

ruoyi-system/src/main/resources/mapper/system/ZxConferenceMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isJoin"    column="sub_is_join"    />
         <result property="leaveType"    column="sub_leave_type"    />
         <result property="leaveReason"    column="sub_leave_reason"    />
+        <result property="approval"    column="sub_approval"    />
         <result property="signIn"    column="sub_sign_in"    />
         <result property="createBy"    column="sub_create_by"    />
         <result property="createTime"    column="sub_create_time"    />
@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZxConferenceList" parameterType="ZxConference" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title, a.conference_date,a.conference_type, a.conference_time, a.conference_address, a.publish_time,a.conference_qr, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-        b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.parent_grade as sub_parent_grade,b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+        b.conference_id as sub_conference_id,b.approval as sub_approval,b.phonenumber as sub_phonenumber, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.parent_grade as sub_parent_grade,b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
         <where>
@@ -82,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectZxConferenceByConferenceId" parameterType="Long" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title,a.conference_qr,a.conference_type, a.conference_date, a.conference_time, a.conference_address, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
- b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade,b.phonenumber as sub_phonenumber, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
+ b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade,b.approval as sub_approval,b.phonenumber as sub_phonenumber, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
         f.id as fj_id,f.main_id as fj_main_id, f.source_id as fj_source_id, f.name as fj_name, f.url as fj_url, f.type as fj_type,f.stytle as fj_stytle
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
@@ -95,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where b.conference_id = #{conferenceId}
     </select>
     <select id="selectZxConferenceUser" parameterType = "zxConferenceUser" resultMap="ZxConferenceUserResult">
-        select b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+        select b.conference_id as sub_conference_id,b.approval as sub_approval,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from  zx_conference_user b
         <where>
             b.conference_id = #{conferenceId}
@@ -104,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectZxConferenceInfo" parameterType="ZxConference" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title,a.conference_qr,a.conference_type, a.conference_date, a.conference_time, a.conference_address, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+               b.conference_id as sub_conference_id,b.approval as sub_approval,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from zx_conference a
                  left join zx_conference_user b on b.conference_id = a.conference_id
         <where>
@@ -171,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leaveType != null and leaveType != ''">leave_type = #{leaveType},</if>
             <if test="leaveReason != null and leaveReason != ''">leave_reason = #{leaveReason},</if>
             <if test="signIn != null and signIn != ''">sign_in = #{signIn},</if>
+            <if test="approval != null and approval != ''">approval = #{approval},</if>
         </trim>
         where conference_id = #{conferenceId} and user_id = #{userId}
     </update>
@@ -202,9 +204,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchZxConferenceUser">
-        insert into zx_conference_user( conference_id, user_id, user_name,phonenumber , post_name, user_level, reply_time, is_join, leave_type,parent_grade, leave_reason, sign_in ,create_by, create_time, update_by, update_time, remark) values
+        insert into zx_conference_user( conference_id, user_id, user_name,phonenumber,approval, post_name, user_level, reply_time, is_join, leave_type,parent_grade, leave_reason, sign_in ,create_by, create_time, update_by, update_time, remark) values
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.conferenceId}, #{item.userId}, #{item.userName}, #{item.phonenumber},#{item.postName}, #{item.userLevel}, #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason},#{item.signIn}, #{item.createBy}, sysdate(), #{item.updateBy}, #{item.updateTime}, #{item.remark})
+            ( #{item.conferenceId}, #{item.userId}, #{item.userName}, #{item.phonenumber},#{item.approval},#{item.postName}, #{item.userLevel}, #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason},#{item.signIn}, #{item.createBy}, sysdate(), #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>
 </mapper>