4caba6f32b75523bde4bf2f988946153d5c47944..8874017d0a7321298ed1c24045a300b11b73953d
2024-06-26 龚焕茏
Merge remote-tracking branch 'origin/dev' into dev
887401 对比 | 目录
2024-06-26 龚焕茏
feat:考试监控
ee86e2 对比 | 目录
2个文件已修改
6 ■■■■ 已修改文件
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ExamSubmitTempMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -441,7 +441,7 @@
    @Override
    public Result monitorList(ExamQuery query) {
        IPage<ExamSubmitTempVO> page = PageUtil.getPage(query, ExamSubmitTempVO.class);
        return Result.ok().data(examSubmitTempMapper.monitorList(page, query));
        return Result.ok((examSubmitTempMapper.monitorList(page, query)));
    }
    @Override
src/main/resources/mapper/ExamSubmitTempMapper.xml
@@ -52,7 +52,7 @@
            TEST.status,
            TEST.id,
            TE.exam_name,
            TU.real_name
            TU.real_name as userName
        FROM
            t_exam_submit_temp TEST
        INNER JOIN t_user TU ON TU.id = TEST.user_id AND TU.deleted = 0
@@ -63,7 +63,7 @@
            AND TEST.exam_id = #{query.examId}
        </if>
        <if test="query.keyword != null and query.keyword != ''">
            AND (INSTR(TU.real_name, #{query.keyword})) OR (INSTR(TE.exam_name, #{query.keyword})
            AND (INSTR(TU.real_name, #{query.keyword}) OR INSTR(TE.exam_name, #{query.keyword}))
        </if>
    </select>