Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/domain/bonus/ZxBonus.java

@@ -31,6 +31,10 @@ public class ZxBonus extends BaseEntity
     /** 考核类型 */
     @Excel(name = "考核类型")
     private String checkType;
+    /**
+     * 是否审核 1：待审核 2:已审核 3：已驳回
+     */
+    private String type;
 
     /** 加分类型 */
     @Excel(name = "加分类型")
@@ -49,7 +53,15 @@ public class ZxBonus extends BaseEntity
     @Excel(name = "分数")
     private String score;
 
-    public void setBonusId(Long bonusId) 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setBonusId(Long bonusId)
     {
         this.bonusId = bonusId;
     }

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

@@ -36,10 +36,15 @@ public class ZxConferenceUser extends BaseEntity
     private String userLevel;
 
     /** 答复时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "答复时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "答复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date replyTime;
 
+    /** 签到时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "签到时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date signIn;
+
     /** 是否参会 N:不参加 Y：参加 */
     @Excel(name = "是否参会 N:不参加 Y：参加")
     private String isJoin;
@@ -52,7 +57,15 @@ public class ZxConferenceUser extends BaseEntity
     @Excel(name = "请假原因")
     private String leaveReason;
 
-    public void setConferenceId(Long conferenceId) 
+    public Date getSignIn() {
+        return signIn;
+    }
+
+    public void setSignIn(Date signIn) {
+        this.signIn = signIn;
+    }
+
+    public void setConferenceId(Long conferenceId)
     {
         this.conferenceId = conferenceId;
     }

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bonusReason"    column="bonus_reason"    />
         <result property="bonusTime"    column="bonus_time"    />
         <result property="score"    column="score"    />
+        <result property="type"    column="type"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZxBonusVo">
-        select bonus_id, user_id, boundary, check_type, bonus_type, bonus_reason, bonus_time, score, create_by, create_time, update_by, update_time, remark from zx_bonus
+        select bonus_id, user_id, boundary, check_type, bonus_type, bonus_reason, bonus_time, score,type, create_by, create_time, update_by, update_time, remark from zx_bonus
     </sql>
 
     <select id="selectZxBonusList" parameterType="ZxBonus" resultMap="ZxBonusResult">
@@ -34,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusReason != null  and bonusReason != ''"> and bonus_reason = #{bonusReason}</if>
             <if test="bonusTime != null "> and bonus_time = #{bonusTime}</if>
             <if test="score != null  and score != ''"> and score = #{score}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
         </where>
     </select>
     
@@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusReason != null">bonus_reason,</if>
             <if test="bonusTime != null">bonus_time,</if>
             <if test="score != null">score,</if>
+            <if test="type != null">type,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusReason != null">#{bonusReason},</if>
             <if test="bonusTime != null">#{bonusTime},</if>
             <if test="score != null">#{score},</if>
+            <if test="type != null">#{type},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -84,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bonusReason != null">bonus_reason = #{bonusReason},</if>
             <if test="bonusTime != null">bonus_time = #{bonusTime},</if>
             <if test="score != null">score = #{score},</if>
+            <if test="type != null">type = #{type},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

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

@@ -33,6 +33,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="signIn"    column="sub_sign_in"    />
         <result property="createBy"    column="sub_create_by"    />
         <result property="createTime"    column="sub_create_time"    />
         <result property="updateBy"    column="sub_update_by"    />
@@ -46,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZxConferenceList" parameterType="ZxConference" resultMap="ZxConferenceResult">
         select a.conference_id, a.conference_title, 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.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.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.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>  
@@ -62,13 +63,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectZxConferenceByConferenceId" parameterType="Long" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title, 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.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.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.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 a.conference_id = #{conferenceId}
     </select>
     <select id="selectZxConferenceUserByConferenceId" resultMap="ZxConferenceUserResult">
-        select b.conference_id as sub_conference_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.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.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.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}
     </select>
@@ -123,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isJoin != null and isJoin != ''">is_join = #{isJoin},</if>
             <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>
         </trim>
         where conference_id = #{conferenceId} and user_id = #{userId}
     </update>
@@ -150,9 +152,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchZxConferenceUser">
-        insert into zx_conference_user( conference_id, user_id, user_name, post_name, user_level, reply_time, is_join, leave_type, leave_reason, create_by, create_time, update_by, update_time, remark) values
+        insert into zx_conference_user( conference_id, user_id, user_name, post_name, user_level, reply_time, is_join, leave_type, 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.postName}, #{item.userLevel}, #{item.replyTime}, #{item.isJoin}, #{item.leaveType}, #{item.leaveReason}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
+            ( #{item.conferenceId}, #{item.userId}, #{item.userName}, #{item.postName}, #{item.userLevel}, #{item.replyTime}, #{item.isJoin}, #{item.leaveType}, #{item.leaveReason},#{item.signIn}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>
 </mapper>