1。通知公告新增数据同步 2.考试分数查询接口修改，sqlserver isnull 修改为mysql ifnull

Administrator

2021-07-27 32f668a5ef72901c3434684a45f5faa616d5b8a9

1。通知公告新增数据同步
2.考试分数查询接口修改，sqlserver isnull 修改为mysql ifnull

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

@@ -8,7 +8,7 @@
            sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
            ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
            bu.real_name name,sa.examination_type,sa.examination_mx,
            bd.dept_name deptName
            bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
        FROM
            sys_apply sa
        left join

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

@@ -57,4 +57,14 @@
     */
    private String deptName;

    /**
     * 身份证号
     */
    private String idCardNo;

    /**
     * 报考的证件
     */
    private String applyCard;

}

 src/main/java/org/springblade/modules/desk/controller/NoticeController.java

@@ -21,6 +21,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiSort;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Condition;
@@ -130,7 +131,9 @@
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入notice")
    public R submit(@RequestBody Notice notice) {
    public R submit(@RequestBody Notice notice) throws Exception {
        //调用内网
        arg.test01(arg.url+"/blade-desk/notice/submit",notice);
        return R.status(noticeService.saveOrUpdate(notice));
    }

@@ -140,7 +143,9 @@
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入notice")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) throws Exception {
        //调用内网
//        arg.test01(arg.url+"/blade-desk/notice/remove",ids);
        boolean temp = noticeService.deleteLogic(Func.toLongList(ids));
        return R.status(temp);
    }

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

@@ -62,7 +62,7 @@


    /**
     * 考试人员所属公司名称
     * 考试人员所属公司名称id
     */
    private String company;


 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml

@@ -5,7 +5,7 @@
    <!--考试成绩分页信息-->
    <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
        SELECT
         id,candidate_no candidateNo,theory_grade theoryGrade,isnull(learn_grade,-1) learnGrade,all_grade,
         id,candidate_no candidateNo,theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,all_grade,
         exam_name examName,security_name securityName,exam_type examType,company,exam_time examTime,
         all_score allScore,exam_end_time examEndTime,qualified
        FROM
@@ -35,7 +35,7 @@
    <!--考试成绩详情信息-->
    <select id="selectExamScoreInfo" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
        SELECT
            id,candidate_no candidateNo,theory_grade theoryGrade,isnull(learn_grade,-1) learnGrade,all_grade,
            id,candidate_no candidateNo,theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,all_grade,
            exam_name examName,security_name securityName,exam_type examType,company,exam_time examTime,
            all_score allScore,exam_end_time examEndTime,qualified
        FROM