From 075af2a64957937c76fc324dd3b116ba0b90d5e1 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Mon, 24 Aug 2026 12:02:13 +0800 Subject: [PATCH] user paper exam --- .../cedu/controller/PaperExamController.java | 61 ++--------- .../cedu/convertor/PaperExamConvertor.java | 11 ++ .../PaperExamQuestionUserConvertor.java | 17 +++ .../org/qinan/cedu/mapper/QuestionMapper.java | 9 ++ .../qinan/cedu/model/dto/PaperExamDTO.java | 3 +- .../cedu/model/dto/PaperExamPageQueryDTO.java | 3 +- .../model/dto/PaperExamQuestionUserDTO.java | 14 ++- .../qinan/cedu/model/entity/PaperExamDO.java | 3 +- .../model/entity/PaperExamQuestionUserDO.java | 14 ++- .../model/vo/PaperExamQuestionUserVO.java | 14 ++- .../org/qinan/cedu/model/vo/PaperExamVO.java | 3 +- .../qinan/cedu/service/PaperExamService.java | 10 ++ .../service/impl/PaperExamServiceImpl.java | 102 ++++++++++++++++++ .../main/resources/mapper/QuestionMapper.xml | 10 ++ .../client/co/ClassSelectPersonnelCO.java | 3 + .../resources/mapper/OrgPersonnelMapper.xml | 2 +- 16 files changed, 212 insertions(+), 67 deletions(-) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/PaperExamController.java b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/PaperExamController.java index 6c0ed7e0..ec50bc66 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/controller/PaperExamController.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/controller/PaperExamController.java @@ -1,18 +1,17 @@ package org.qinan.cedu.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; -import org.qinan.cedu.model.dto.PaperExamDTO; -import org.qinan.cedu.model.dto.PaperExamPageQueryDTO; -import org.qinan.cedu.model.vo.PaperExamVO; +import org.qinan.cedu.model.vo.StartExamVO; import org.qinan.cedu.service.PaperExamService; -import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * 考试试卷管理 @@ -26,49 +25,11 @@ public class PaperExamController { private final PaperExamService paperExamService; /** - * 分页查询考试试卷 + * 去考试：生成考试记录和用户试题作答记录，返回考试信息（含试题列表及参考答案） */ - @ApiOperation("分页查询考试试卷") - @GetMapping("/page") - public PageResponse page(PaperExamPageQueryDTO query) { - IPage page = paperExamService.pageQuery(query); - return PageResponse.of(page.getRecords(), page.getTotal()); - } - - /** - * 查询考试试卷详情 - */ - @ApiOperation("考试试卷详情") - @GetMapping("/{id}") - public SingleResponse get(@ApiParam("主键id") @PathVariable Long id) { - return SingleResponse.success(paperExamService.getDetail(id)); - } - - /** - * 新增考试试卷 - */ - @ApiOperation("新增考试试卷") - @PostMapping("/save") - public SingleResponse save(@Validated @RequestBody PaperExamDTO dto) { - return SingleResponse.success(paperExamService.savePaperExam(dto)); - } - - /** - * 修改考试试卷 - */ - @ApiOperation("修改考试试卷") - @PutMapping("/update") - public SingleResponse update(@Validated @RequestBody PaperExamDTO dto) { - return SingleResponse.success(paperExamService.updatePaperExam(dto)); - } - - /** - * 删除考试试卷 - */ - @ApiOperation("删除考试试卷") - @DeleteMapping("/{id}") - public SingleResponse delete(@ApiParam("主键id") @PathVariable Long id) { - paperExamService.deleteById(id); - return SingleResponse.success(); + @ApiOperation("去考试") + @PostMapping("/startExam") + public SingleResponse startExam(@ApiParam(value = "试卷id", required = true) @RequestParam Long paperId) { + return SingleResponse.success(paperExamService.startExam(paperId, AuthContext.getUserId())); } } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamConvertor.java index bfa70f91..3674ff4a 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamConvertor.java @@ -1,9 +1,11 @@ package org.qinan.cedu.convertor; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.qinan.cedu.model.dto.PaperExamDTO; import org.qinan.cedu.model.entity.PaperExamDO; import org.qinan.cedu.model.vo.PaperExamVO; +import org.qinan.cedu.model.vo.StartExamVO; import java.util.List; @@ -17,6 +19,15 @@ public interface PaperExamConvertor { PaperExamVO convertEToVo(PaperExamDO entity); + /** + * 考试试卷DO转去考试返回VO（id 映射为 paperExamId） + * + * @param entity 考试试卷实体 + * @return 去考试返回VO + */ + @Mapping(source = "id", target = "paperExamId") + StartExamVO convertEToStartExamVo(PaperExamDO entity); + List convertDtoListToEList(List list); List convertEListToVoList(List list); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamQuestionUserConvertor.java b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamQuestionUserConvertor.java index 73fa6879..e6400683 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamQuestionUserConvertor.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/convertor/PaperExamQuestionUserConvertor.java @@ -4,6 +4,7 @@ import org.mapstruct.Mapper; import org.qinan.cedu.model.dto.PaperExamQuestionUserDTO; import org.qinan.cedu.model.entity.PaperExamQuestionUserDO; import org.qinan.cedu.model.vo.PaperExamQuestionUserVO; +import org.qinan.cedu.model.vo.StartExamQuestionVO; import java.util.List; @@ -17,6 +18,22 @@ public interface PaperExamQuestionUserConvertor { PaperExamQuestionUserVO convertEToVo(PaperExamQuestionUserDO entity); + /** + * 去考试试题VO转用户试卷试题DO（复制试题id与试题分数） + * + * @param vo 去考试试题VO + * @return 用户试卷试题DO + */ + PaperExamQuestionUserDO convertStartExamVoToE(StartExamQuestionVO vo); + + /** + * 用户试卷试题DO转去考试试题VO + * + * @param entity 用户试卷试题DO + * @return 去考试试题VO + */ + StartExamQuestionVO convertEToStartExamVo(PaperExamQuestionUserDO entity); + List convertDtoListToEList(List list); List convertEListToVoList(List list); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/QuestionMapper.java b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/QuestionMapper.java index dc686d97..2c4f2cb9 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/QuestionMapper.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/mapper/QuestionMapper.java @@ -12,6 +12,7 @@ import org.qinan.cedu.model.vo.PaperQuestionDetailVO; import org.qinan.cedu.model.vo.PaperQuestionVO; import org.qinan.cedu.model.vo.QuestionTypeCountVO; import org.qinan.cedu.model.vo.QuestionVO; +import org.qinan.cedu.model.vo.StartExamQuestionVO; import java.util.List; /** @@ -54,6 +55,14 @@ public interface QuestionMapper extends BaseMapper { */ List listPaperQuestions(@Param("paperId") Long paperId); + /** + * 查询试卷的考试试题及参考答案信息（分值取试卷试题关系的分值，按试题号排序） + * + * @param paperId 试卷id + * @return 试题及答案列表 + */ + List listExamQuestions(@Param("paperId") Long paperId); + /** * 按题型统计试题数量（按关联课件过滤，一条SQL聚合） * diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamDTO.java index 1dc3cf9f..696d5751 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.qinan.cedu.enums.PaperExamStatusEnum; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; @@ -53,7 +54,7 @@ public class PaperExamDTO { @NotNull(message = "用户id不能为空") private Long userId; - @ApiModelProperty(value = "考试状态 non_start 未开始, doing 进行中, finished 已完成", required = true) + @ApiModelProperty(value = "考试状态 " + PaperExamStatusEnum.REMARKS, required = true) @NotBlank(message = "考试状态不能为空") private String paperExamStatus; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamPageQueryDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamPageQueryDTO.java index 108b192f..c5806815 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamPageQueryDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamPageQueryDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.qinan.cedu.enums.PaperExamStatusEnum; import org.qinan.cedu.model.query.BasePageQuery; /** @@ -23,7 +24,7 @@ public class PaperExamPageQueryDTO extends BasePageQuery { @ApiModelProperty("用户id") private Long userId; - @ApiModelProperty("考试状态 non_start 未开始, doing 进行中, finished 已完成") + @ApiModelProperty("考试状态 " + PaperExamStatusEnum.REMARKS) private String paperExamStatus; @ApiModelProperty("考试是否通过 1是 0否") diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamQuestionUserDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamQuestionUserDTO.java index 1ccdf8bc..7424c9e6 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamQuestionUserDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperExamQuestionUserDTO.java @@ -33,11 +33,17 @@ public class PaperExamQuestionUserDTO { @NotNull(message = "试题id不能为空") private Long questionId; - @ApiModelProperty("答案：逗号隔开") - private String answer; + @ApiModelProperty("用户作答答案") + private String userAnswer; - @ApiModelProperty("答案选项id 多个逗号隔开") - private String answerQuestionOptionIds; + @ApiModelProperty("用户作答答案选项id 多个逗号隔开") + private String userAnswerQuestionOptionIds; + + @ApiModelProperty("作答状态 non 未作答，done 已作答") + private String answerStatus; + + @ApiModelProperty("正确状态 false 作答错误，true 作答正确") + private String rightStatus; @ApiModelProperty(value = "试题分数", required = true) @NotNull(message = "试题分数不能为空") diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamDO.java index 02156298..426a2e78 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamDO.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.qinan.cedu.enums.PaperExamStatusEnum; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -54,7 +55,7 @@ public class PaperExamDO extends BaseEntity { @ApiModelProperty("用户id") private Long userId; - @ApiModelProperty("考试状态 non_start 未开始, doing 进行中, finished 已完成") + @ApiModelProperty("考试状态 " + PaperExamStatusEnum.REMARKS) private String paperExamStatus; @ApiModelProperty("考试试卷状态 normal 正常") diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamQuestionUserDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamQuestionUserDO.java index 7b2bd2c4..7edc8744 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamQuestionUserDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperExamQuestionUserDO.java @@ -37,11 +37,17 @@ public class PaperExamQuestionUserDO extends BaseEntity { @ApiModelProperty("试题id") private Long questionId; - @ApiModelProperty("答案：逗号隔开") - private String answer; + @ApiModelProperty("用户作答答案") + private String userAnswer; - @ApiModelProperty("答案选项id 多个逗号隔开") - private String answerQuestionOptionIds; + @ApiModelProperty("用户作答答案选项id 多个逗号隔开") + private String userAnswerQuestionOptionIds; + + @ApiModelProperty("作答状态 non 未作答，done 已作答") + private String answerStatus; + + @ApiModelProperty("正确状态 false 作答错误，true 作答正确") + private String rightStatus; @ApiModelProperty("试题分数") private BigDecimal questionScore; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamQuestionUserVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamQuestionUserVO.java index 1a9de12e..407b2cfc 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamQuestionUserVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamQuestionUserVO.java @@ -27,11 +27,17 @@ public class PaperExamQuestionUserVO extends BaseVO { @ApiModelProperty("试题id") private String questionId; - @ApiModelProperty("答案：逗号隔开") - private String answer; + @ApiModelProperty("用户作答答案") + private String userAnswer; - @ApiModelProperty("答案选项id 多个逗号隔开") - private String answerQuestionOptionIds; + @ApiModelProperty("用户作答答案选项id 多个逗号隔开") + private String userAnswerQuestionOptionIds; + + @ApiModelProperty("作答状态 non 未作答，done 已作答") + private String answerStatus; + + @ApiModelProperty("正确状态 false 作答错误，true 作答正确") + private String rightStatus; @ApiModelProperty("试题分数") private BigDecimal questionScore; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamVO.java index 0ab4f7c2..a8468c70 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperExamVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.qinan.cedu.enums.PaperExamStatusEnum; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -47,7 +48,7 @@ public class PaperExamVO extends BaseVO { @ApiModelProperty("用户id") private String userId; - @ApiModelProperty("考试状态 non_start 未开始, doing 进行中, finished 已完成") + @ApiModelProperty("考试状态 " + PaperExamStatusEnum.REMARKS) private String paperExamStatus; @ApiModelProperty("考试试卷状态 normal 正常") diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/PaperExamService.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/PaperExamService.java index 552d2f00..e429da57 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/PaperExamService.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/PaperExamService.java @@ -6,6 +6,7 @@ import org.qinan.cedu.model.dto.PaperExamDTO; import org.qinan.cedu.model.dto.PaperExamPageQueryDTO; import org.qinan.cedu.model.entity.PaperExamDO; import org.qinan.cedu.model.vo.PaperExamVO; +import org.qinan.cedu.model.vo.StartExamVO; /** * 考试试卷服务接口 @@ -51,4 +52,13 @@ public interface PaperExamService extends IService { * @return 是否成功 */ boolean deleteById(Long id); + + /** + * 去考试：根据试卷生成考试记录及用户试题作答记录 + * + * @param paperId 试卷id + * @param userId 用户id + * @return 考试信息（含试题列表及参考答案） + */ + StartExamVO startExam(Long paperId, Long userId); } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperExamServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperExamServiceImpl.java index a9afc8da..340f03d7 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperExamServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperExamServiceImpl.java @@ -5,18 +5,31 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.qinan.cedu.convertor.PaperExamConvertor; +import org.qinan.cedu.convertor.PaperExamQuestionUserConvertor; import org.qinan.cedu.enums.DeleteEnum; +import org.qinan.cedu.enums.PaperExamStatusEnum; import org.qinan.cedu.mapper.PaperExamMapper; +import org.qinan.cedu.mapper.PaperMapper; +import org.qinan.cedu.mapper.QuestionMapper; import org.qinan.cedu.model.dto.PaperExamDTO; import org.qinan.cedu.model.dto.PaperExamPageQueryDTO; +import org.qinan.cedu.model.entity.PaperDO; import org.qinan.cedu.model.entity.PaperExamDO; +import org.qinan.cedu.model.entity.PaperExamQuestionUserDO; import org.qinan.cedu.model.vo.PaperExamVO; +import org.qinan.cedu.model.vo.StartExamQuestionVO; +import org.qinan.cedu.model.vo.StartExamVO; +import org.qinan.cedu.service.PaperExamQuestionUserService; import org.qinan.cedu.service.PaperExamService; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; /** * 考试试卷服务实现 @@ -27,8 +40,22 @@ public class PaperExamServiceImpl extends ServiceImpl pageQuery(PaperExamPageQueryDTO query) { return this.lambdaQuery() @@ -82,4 +109,79 @@ public class PaperExamServiceImpl extends ServiceImpl questionList = questionMapper.listExamQuestions(paperId); + if (questionList.isEmpty()) { + throw new IllegalArgumentException("试卷未配置试题，无法开始考试"); + } + // 生成并保存考试记录 + PaperExamDO paperExam = buildPaperExam(paper, userId); + this.save(paperExam); + // 生成并保存用户试题作答记录，同时回填作答记录信息到返回列表 + saveQuestionUserList(paperExam, questionList); + // 组装返回结果 + StartExamVO startExamVO = paperExamConvertor.convertEToStartExamVo(paperExam); + startExamVO.setPaperType(paper.getPaperType()); + startExamVO.setConfigRule(paper.getConfigRule()); + startExamVO.setQuestionList(questionList); + return startExamVO; + } + + /** + * 构建考试记录实体（复制试卷基本信息，置为进行中状态） + *

不使用 MapStruct 同名拷贝，避免把试卷的审计字段（创建人/创建时间等）带入考试记录

+ */ + private PaperExamDO buildPaperExam(PaperDO paper, Long userId) { + PaperExamDO paperExam = new PaperExamDO(); + paperExam.setPaperId(paper.getId()); + paperExam.setPaperName(paper.getPaperName()); + paperExam.setPaperTotalScore(paper.getPaperTotalScore()); + paperExam.setPaperPassScore(paper.getPaperPassScore()); + paperExam.setExamTime(paper.getExamTime()); + paperExam.setUserId(userId); + paperExam.setExamScore(BigDecimal.ZERO); + paperExam.setPassed(0); + paperExam.setPaperExamStatus(PaperExamStatusEnum.DOING.getValue()); + paperExam.setStatus(STATUS_NORMAL); + // paper_exam 表无 org_id 列，插入前不填充机构id + InsertFieldDefaults.applyIgnoreOrgId(paperExam); + return paperExam; + } + + /** + * 构建并保存用户试题作答记录（初始为未作答、0分），并将生成结果回填到试题返回列表 + */ + private void saveQuestionUserList(PaperExamDO paperExam, List questionList) { + List questionUserList = new ArrayList<>(questionList.size()); + for (StartExamQuestionVO question : questionList) { + PaperExamQuestionUserDO questionUser = paperExamQuestionUserConvertor.convertStartExamVoToE(question); + questionUser.setPaperExamId(paperExam.getId()); + questionUser.setUserId(paperExam.getUserId()); + questionUser.setPaperId(paperExam.getPaperId()); + questionUser.setAnswerStatus(ANSWER_STATUS_NON); + questionUser.setRightStatus(RIGHT_STATUS_FALSE); + questionUser.setAnswerScore(BigDecimal.ZERO); + InsertFieldDefaults.apply(questionUser); + questionUserList.add(questionUser); + } + paperExamQuestionUserService.saveBatch(questionUserList); + // 回填保存后的作答记录信息，参考答案字段保留试题查询结果 + for (int i = 0; i < questionList.size(); i++) { + String answer = questionList.get(i).getAnswer(); + String answerQuestionOptionIds = questionList.get(i).getAnswerQuestionOptionIds(); + StartExamQuestionVO questionVO = paperExamQuestionUserConvertor.convertEToStartExamVo(questionUserList.get(i)); + questionVO.setAnswer(answer); + questionVO.setAnswerQuestionOptionIds(answerQuestionOptionIds); + questionList.set(i, questionVO); + } + } } diff --git a/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml b/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml index f0034a5d..66506520 100644 --- a/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml +++ b/safety-cedu-service/src/main/resources/mapper/QuestionMapper.xml @@ -80,4 +80,14 @@ ORDER BY RAND() LIMIT #{num} + + diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/ClassSelectPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/ClassSelectPersonnelCO.java index 4f3c1e2b..1adbfee3 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/ClassSelectPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/ClassSelectPersonnelCO.java @@ -28,4 +28,7 @@ public class ClassSelectPersonnelCO { @ApiModelProperty(value = "部门ID") private Long deptId; + + @ApiModelProperty(value = "部门名称") + private String deptName; } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml index 65ad9a35..7cc199b0 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml @@ -112,7 +112,7 @@