1.工作汇报查询修改 2.考试成绩查询接口修改

Administrator

2021-08-16 e810bb568064ff87f0462daafe86e4c39579647b

1.工作汇报查询修改
2.考试成绩查询接口修改

 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java

@@ -170,6 +170,20 @@
        return R.data(detail);
    }


    /**
     * 详情
     * @param examScore 考试成绩信息对象
     */
    @GetMapping("/details")
    @ApiOperation(value = "详情", notes = "传入examScore")
    public R<ExamScore> detail(ExamScore examScore) {
        //查询考试成绩详情
        ExamScore detail = examScoreService.getOne(Condition.getQueryWrapper(examScore));
        //返回
        return R.data(detail);
    }

    /**
     * 导入实操成绩
     * @param isCovered 1 覆盖  0不覆盖

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

@@ -6,8 +6,10 @@
    <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
        SELECT
         es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
         ke.exam_name examName,bu.real_name securityName,company,es.exam_time examTime,
         all_grade allGrade,exam_end_time examEndTime,qualified,
         es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
         ke.exam_name examName,
         bu.real_name securityName,company,bu.account,
         sa.is_exam isExam,
         bd.dept_name companyName
        FROM
            exam_score es
@@ -23,6 +25,10 @@
            ksxt_exam ke
        on
            ke.id = es.exam_id
        left join
            sys_apply sa
        on
            sa.user_id = bu.id
        WHERE
            1=1
        <if test="examScore.examName!=null and  examScore.examName!=''">
@@ -37,6 +43,9 @@
        <if test="examScore.userId!=null and  examScore.userId!=''">
            and es.user_id = #{examScore.userId}
        </if>
        <if test="examScore.isExam!=null and  examScore.isExam!=''">
            and sa.is_exam = #{examScore.isExam}
        </if>
        <if test="examScore.examType!=null and  examScore.examType!=''">
            and ke.exam_type = #{examScore.examType}
        </if>

 src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java

@@ -34,4 +34,16 @@
     * 考试类型
     */
    private Integer examType;


    /**
     * 是否考试  1：否  2：是，考试结束  3:考试中
     */
    private Integer isExam;

    /**
     * 用户名
     */
    private String account;

}

 src/main/java/org/springblade/modules/workreport/mapper/WorkReportMapper.xml

@@ -21,6 +21,9 @@
        <if test="workReport.realName!=null and  workReport.realName!=''">
            and bu.real_name like concat('%', #{workReport.realName},'%')
        </if>
        <if test="workReport.content!=null and  workReport.content!=''">
            and swr.content like concat('%', #{workReport.content},'%')
        </if>
        <if test="workReport.type!=null">
            and swr.type = #{workReport.type}
        </if>
@@ -51,6 +54,9 @@
        <if test="workReport.realName!=null and  workReport.realName!=''">
            and bu.real_name like concat('%', #{workReport.realName},'%')
        </if>
        <if test="workReport.content!=null and  workReport.content!=''">
            and swr.content like concat('%', #{workReport.content},'%')
        </if>
        <if test="workReport.type!=null">
            and swr.type = #{workReport.type}
        </if>