培训考试申请修改，日志配置修改

Administrator

2021-09-03 710b1f65394d2077fdb109159d2def32dd3c018c

培训考试申请修改，日志配置修改

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

@@ -126,7 +126,8 @@
            sr.candidate_no candidateNo,
            bt.dept_name AS deptName,"保安证" applyCard,
            bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.avatar myPicture,
            ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName
            ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
            si.enterpriseName company,si.address
        FROM
        sys_training_registration sr
        LEFT JOIN
@@ -145,6 +146,10 @@
        ksxt_exam ke
        on
        ke.id = sr.train_exam_id
        left join
        sys_information si
        on
        si.departmentid = sr.training_unit_id
        WHERE
        1=1
          and sr.id = #{apply.id}

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

@@ -96,4 +96,15 @@
     */
    private String myPicture;

    /**
     * 公司名称
     */
    private String company;


    /**
     * 地址
     */
    private String address;

}

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -323,6 +323,7 @@
            where
            bu.is_deleted = 0
            and bu.status = 1
            and bu.examination_type != 1
            and bd.dept_category = 1
            and (hold = 2 or hold = 3)
            and bd.id = #{user.deptId}

 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java

@@ -459,13 +459,19 @@
     * @param ids 报名ids
     * @param startTime 考试开始时间
     * @param number 报名人数
     * @param endTime 截止时间
     * @param serialStart 报名序号开始
     * @param serialEnd 报名序号结束
     */
    @PostMapping("/batchExam")
    public R batchExam(@RequestParam String ids,
                       String examTime,
                       @RequestParam Date startTime,
                       @RequestParam Integer number,
                       Date endTime){
                       @RequestParam Date endTime,
                       @RequestParam Integer serialStart,
                       @RequestParam Integer serialEnd
    ){
        if (!ids.equals("")){
            List<String> list = Arrays.asList(ids.split(","));
            if (list.size()>0){
@@ -473,13 +479,13 @@
//                examPaper.setExamTime(examTime);
                examPaper.setExamType(2);
                examPaper.setStartTime(startTime);
//                examPaper.setEndTime(endTime);
                examPaper.setEndTime(endTime);
                Calendar instance = Calendar.getInstance();
                instance.setTime(startTime);
                int year = instance.get(Calendar.YEAR);
                int month = instance.get(Calendar.MONTH)+1;
                int day = instance.get(Calendar.DAY_OF_MONTH);
                String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
                String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
                examPaper.setExamName(examName);
                //待审核
                examPaper.setAuditStatus(3);
@@ -488,11 +494,13 @@

                Long sid = examPaper.getId();
                String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
                String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,audit_status) " +
                String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
                String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,audit_status) " +
                    "values(" + "'" + sid + "'" +
                    "," + "'" + examPaper.getExamName() + "'" +
                    "," + "'" + examPaper.getExamType() +"'" +
                    "," + "'" + format +"'" +
                    "," + "'" + endTimeFormat +"'" +
                    ","  +"'" + examPaper.getAuditStatus() + "'" + ")";
                FtpUtil.sqlFileUpload(s);

@@ -515,20 +523,20 @@
            }else {
                //查询已报名的人员前 number 个
                //查询已报名未关联试卷的人员
                List<Long> applyIds = trainingRegistrationService.getTrainIds(number);
                List<Long> applyIds = trainingRegistrationService.getTrainIds(number,serialStart,serialEnd);
                if (applyIds.size()>0){
                    //生成考试
                    ExamPaper examPaper = new ExamPaper();
//                examPaper.setExamTime(examTime);
                    examPaper.setExamType(2);
                    examPaper.setStartTime(startTime);
//                examPaper.setEndTime(endTime);
                    examPaper.setEndTime(endTime);
                    Calendar instance = Calendar.getInstance();
                    instance.setTime(startTime);
                    int year = instance.get(Calendar.YEAR);
                    int month = instance.get(Calendar.MONTH)+1;
                    int day = instance.get(Calendar.DAY_OF_MONTH);
                    String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
                    String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
                    examPaper.setExamName(examName);
                    //待审核
                    examPaper.setAuditStatus(3);
@@ -537,11 +545,13 @@

                    Long sid = examPaper.getId();
                    String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
                    String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,audit_status) " +
                    String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
                    String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,audit_status) " +
                        "values(" + "'" + sid + "'" +
                        "," + "'" + examPaper.getExamName() + "'" +
                        "," + "'" + examPaper.getExamType() +"'" +
                        "," + "'" + format +"'" +
                        "," + "'" + endTimeFormat +"'" +
                        ","  +"'" + examPaper.getAuditStatus() + "'" + ")";
                    FtpUtil.sqlFileUpload(s);


 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.java

@@ -57,5 +57,7 @@
     * 查询已报名培训公司未关联考试的人员
     * @return
     */
    List<Long> getTrainIds(@Param("number") Integer number);
    List<Long> getTrainIds(@Param("number") Integer number,
                           @Param("serialStart")Integer serialStart,
                           @Param("serialEnd")Integer serialEnd);
}

 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml

@@ -9,7 +9,8 @@
            bt.dept_name AS deptName,
            bt0.dept_name AS trainUnitName,
            bu.real_name realName,bu.phone,bu.cardid idCardNo,
            ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,ke.exam_type examType,
            ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,
            ke.exam_type examType,ke.audit_status auditStatus,
            "保安证" applyCard
        FROM
            sys_training_registration sr
@@ -164,6 +165,6 @@
        and str.cancel = 1
        and bu.is_train = 1
        and (str.train_exam_id is null or ke.audit_status = 3)
        limit 0,#{number}
        limit #{serialStart},#{serialEnd}
    </select>
</mapper>

 src/main/java/org/springblade/modules/training/service/TrainingRegistrationService.java

@@ -61,5 +61,5 @@
     * 查询已报名培训公司未关联考试的人员
     * @return
     */
    List<Long> getTrainIds(Integer number);
    List<Long> getTrainIds(Integer number,Integer serialStart,Integer serialEnd);
}

 src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java

@@ -46,9 +46,12 @@
    @Override
    public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
        List<TrainingRegistrationVo> trainingRegistrationVos = baseMapper.selectTrainingRegistrationPage(page, trainingRegistration);
//        trainingRegistrationVos.forEach(trainingRegistrationVo -> {
//            trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
//        });
        trainingRegistrationVos.forEach(trainingRegistrationVo -> {
            //如果考试id 为空,考试尚未提交审核
            if (null==trainingRegistrationVo.getAuditStatus()){
                trainingRegistrationVo.setAuditStatus(4);
            }
        });
        return page.setRecords(trainingRegistrationVos);
    }

@@ -261,7 +264,9 @@
     * @return
     */
    @Override
    public List<Long> getTrainIds(Integer number) {
        return baseMapper.getTrainIds(number);
    public List<Long> getTrainIds(Integer number,Integer serialStart,Integer serialEnd) {
        serialStart = serialStart -1;
        serialEnd = serialEnd - serialStart;
        return baseMapper.getTrainIds(number,serialStart,serialEnd);
    }
}

 src/main/java/org/springblade/modules/training/vo/TrainingRegistrationVo.java

@@ -77,4 +77,10 @@
     * 多人报名
     */
    private String userIds;


    /**
     * 审核状态  1：审核通过   2：未通过审核  3：审核中  4：待审核
     */
    private Integer auditStatus;
}

 src/main/resources/application-dev.yml

@@ -37,7 +37,7 @@

#图片批量上传zip
upload:
  #  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
#  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
  localtion: ${UPLOAD_DIR:D:/test}
  maxFileSize: 10240KB
  maxRequestSize: 102400KB

 src/main/resources/log/logback-dev.xml

@@ -58,7 +58,7 @@
    </if>

    <!-- 日志输出级别 -->
    <root level="INFO">
    <root level="WARN">
        <appender-ref ref="STDOUT"/>
        <appender-ref ref="${STDOUT_APPENDER}"/>
    </root>
@@ -102,7 +102,7 @@
    <logger name="com.netflix.discovery" level="INFO"/>
    <logger name="com.netflix.eureka" level="INFO"/>
    <!-- 业务日志 -->
    <Logger name="org.springblade" level="INFO"/>
    <Logger name="org.springblade" level="WARN"/>
    <Logger name="org.springblade.core.tenant" level="INFO"/>
    <Logger name="org.springblade.core.version" level="INFO"/>