diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseRecordController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseRecordController.java index 11a1e3db5..5b280a028 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseRecordController.java @@ -74,7 +74,7 @@ public class ExamCourseRecordController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ExamCourseRecord.class, map); Page page = PageUtil.getPage(map); - IPage pageList = examCourseRecordService.page(page, queryWrapper); + IPage pageList = examCourseRecordService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java index 5f5edf826..44278f8d8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java @@ -113,6 +113,7 @@ public class ExamQuestionBankController { @PostMapping(value = "/random") public Result> random(@RequestBody List randomQueryList) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(ExamQuestionBank::getIsEnable, 1); if (randomQueryList.get(0).getSubjectId() != null) { queryWrapper.eq(ExamQuestionBank::getSubjectId, randomQueryList.get(0).getSubjectId()); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainRecordController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainRecordController.java index eb4e4d375..e40a513c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainRecordController.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.exam.controller; import com.zhgd.annotation.OperLog; import com.zhgd.xmgl.modules.exam.entity.ExamAnswerQuestion; import com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord; +import com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.PageUtil; import io.swagger.annotations.Api; @@ -73,10 +74,10 @@ public class ExamTrainRecordController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestBody Map map) { + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ExamTrainRecord.class, map); Page page = PageUtil.getPage(map); - IPage pageList = examTrainRecordService.page(page, queryWrapper); + IPage pageList = examTrainRecordService.pageList(page, queryWrapper); return Result.success(pageList); } @@ -247,7 +248,7 @@ public class ExamTrainRecordController { public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response, @RequestBody Map map) { // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ExamTrainRecord.class, map); - IPage pageList = examTrainRecordService.page(new Page<>(-1, -1), queryWrapper); + IPage pageList = examTrainRecordService.pageList(new Page<>(-1, -1), queryWrapper); //Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //导出文件名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamCourseRecord.java b/src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamCourseRecord.java index 6467f9cb5..3d0da3fca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamCourseRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamCourseRecord.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -121,4 +122,9 @@ public class ExamCourseRecord implements Serializable { @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "修改时间") private Date updateTime; + + @TableField(exist = false) + @Excel(name = "课程名称", width = 20) + @ApiModelProperty(value = "课程名称") + private String courseName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamCourseRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamCourseRecordMapper.java index 045d237f5..4fbede633 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamCourseRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamCourseRecordMapper.java @@ -2,6 +2,8 @@ package com.zhgd.xmgl.modules.exam.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord; @@ -16,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface ExamCourseRecordMapper extends BaseMapper { + Page pageList(Page page, Wrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamCourseRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamCourseRecordMapper.xml index 3c2637311..9f3616704 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamCourseRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamCourseRecordMapper.xml @@ -2,4 +2,8 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamCourseRecordService.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamCourseRecordService.java index 7bf65e481..1235654c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamCourseRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamCourseRecordService.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.exam.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IExamCourseRecordService extends IService { - + Page pageList(Page page, Wrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamCourseRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamCourseRecordServiceImpl.java index 9019a0e01..ac6fbcc25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamCourseRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamCourseRecordServiceImpl.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.exam.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord; import com.zhgd.xmgl.modules.exam.mapper.ExamCourseRecordMapper; import com.zhgd.xmgl.modules.exam.service.IExamCourseRecordService; @@ -16,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ExamCourseRecordServiceImpl extends ServiceImpl implements IExamCourseRecordService { + @Override + public Page pageList(Page page, Wrapper wrapper) { + return baseMapper.pageList(page, wrapper); + } }