Merge remote-tracking branch 'origin/master'

tangzy

2021-09-17 d9caa6f336a052a852b4b9f9fedb57bdbed77386

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml

@@ -202,7 +202,8 @@
            sa.id,sa.candidate_no candidateNo,
            ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
            bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
            bd.dept_name deptName,"保安证" applyCard
            bd.dept_name deptName,"保安证" applyCard,
            er.exam_room_name examRoomName,er.address,er.exam_room_no examRoomNo
        FROM
            sys_apply sa
        left join
@@ -217,6 +218,10 @@
            blade_dept bd
        on
            bd.id = bu.dept_id
        left join
            exam_room er
        on
            er.id = ke.exam_room_id
        WHERE
            sa.id = #{apply.id}
    </select>

 src/main/java/org/springblade/modules/apply/vo/ApplyPaPerVO.java

@@ -107,4 +107,14 @@
     */
    private String address;

    /**
     * 考场名称
     */
    private String examRoomName;

    /**
     * 考场号
     */
    private String examRoomNo;

}

 src/main/java/org/springblade/modules/exam/entity/ExamPaper.java

@@ -129,5 +129,11 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditTime;

    /**
     * 考场号id
     */
    @TableField("exam_room_id")
    private Integer examRoomId;


}

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -238,4 +238,15 @@
    @TableField("reason_for_leav")
    private String reasonForLeav;

    private String holdv;

    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date holdvtime;

    /**
     * 是否缴纳保险 0：是   1：否
     */
    private Integer insurance;

}