admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
GUO 2024-05-22 01:34:02 +08:00
commit adfc45d882
8 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamCourseRecordController.java
View File

@ -74,7 +74,7 @@ public class ExamCourseRecordController {
public Result<IPage<ExamCourseRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<ExamCourseRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ExamCourseRecord.class, map);
Page<ExamCourseRecord> page = PageUtil.getPage(map);
IPage<ExamCourseRecord> pageList = examCourseRecordService.page(page, queryWrapper);
IPage<ExamCourseRecord> pageList = examCourseRecordService.pageList(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java
View File

@ -113,6 +113,7 @@ public class ExamQuestionBankController {
@PostMapping(value = "/random")
public Result<List<ExamQuestionBank>> random(@RequestBody List<RandomQuery> randomQueryList) {
LambdaQueryWrapper<ExamQuestionBank> queryWrapper = Wrappers.<ExamQuestionBank>lambdaQuery();
queryWrapper.eq(ExamQuestionBank::getIsEnable, 1);
if (randomQueryList.get(0).getSubjectId() != null) {
queryWrapper.eq(ExamQuestionBank::getSubjectId, randomQueryList.get(0).getSubjectId());
}

7
src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamTrainRecordController.java
View File

@ -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<IPage<ExamTrainRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
public Result<IPage<ExamTrainRecordVo>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<ExamTrainRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ExamTrainRecord.class, map);
Page<ExamTrainRecord> page = PageUtil.getPage(map);
IPage<ExamTrainRecord> pageList = examTrainRecordService.page(page, queryWrapper);
IPage<ExamTrainRecordVo> 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<String, Object> map) {
// Step.1 组装查询条件
QueryWrapper<ExamTrainRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ExamTrainRecord.class, map);
IPage<ExamTrainRecord> pageList = examTrainRecordService.page(new Page<>(-1, -1), queryWrapper);
IPage<ExamTrainRecordVo> pageList = examTrainRecordService.pageList(new Page<>(-1, -1), queryWrapper);
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
//导出文件名称

6
src/main/java/com/zhgd/xmgl/modules/exam/entity/ExamCourseRecord.java
View File

@ -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;
}

3
src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamCourseRecordMapper.java
View File

@ -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<ExamCourseRecord> {
Page<ExamCourseRecord> pageList(Page page, Wrapper<ExamCourseRecord> wrapper);
}

4
src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamCourseRecordMapper.xml
View File

@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.exam.mapper.ExamCourseRecordMapper">
<select id="pageList" resultType="com.zhgd.xmgl.modules.exam.entity.ExamCourseRecord">
select * from (select e.*, c.course_name from exam_course_record e left join exam_course c on e.course_id = c.id)
${ew.customSqlSegment}
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/exam/service/IExamCourseRecordService.java
View File

@ -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<ExamCourseRecord> {
Page<ExamCourseRecord> pageList(Page page, Wrapper<ExamCourseRecord> wrapper);
}

6
src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamCourseRecordServiceImpl.java
View File

@ -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<ExamCourseRecordMapper, ExamCourseRecord> implements IExamCourseRecordService {
@Override
public Page<ExamCourseRecord> pageList(Page page, Wrapper<ExamCourseRecord> wrapper) {
return baseMapper.pageList(page, wrapper);
}
}