Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/PrintPlanParams.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.bean.params;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.BackupMethodEnum;
-import com.qmth.distributed.print.business.enums.DrawRuleEnum;
+import com.qmth.teachcloud.common.enums.DrawRuleEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/PrintPlanResult.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.BackupMethodEnum;
-import com.qmth.distributed.print.business.enums.DrawRuleEnum;
+import com.qmth.teachcloud.common.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.ExamPrintPlanSyncStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import io.swagger.annotations.ApiModelProperty;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPrintPlan.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.BackupMethodEnum;
-import com.qmth.distributed.print.business.enums.DrawRuleEnum;
+import com.qmth.teachcloud.common.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.ExamPrintPlanSyncStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicPrintConfigMapper.java

@@ -7,6 +7,8 @@ import com.qmth.distributed.print.business.bean.dto.BasicPrintConfigDto;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 印品配置 Mapper 接口
@@ -18,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 public interface BasicPrintConfigMapper extends BaseMapper<BasicPrintConfig> {
 
     IPage<BasicPrintConfigDto> listPage(@Param("page") Page<BasicPrintConfigDto> page, @Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("enable") Boolean enable, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime);
+
+    List<BasicPrintConfig> listBySchoolIdAndExamIdAndOrgId(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("orgId") Long orgId, @Param("type") String type);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicPrintConfigService.java

@@ -20,4 +20,20 @@ public interface BasicPrintConfigService extends IService<BasicPrintConfig> {
     boolean enable(Long id, Boolean enable);
 
     boolean savePrintConfig(BasicPrintConfig basicPrintConfig);
+
+    /**
+     * 根据考试ID和课程代码获取印品
+     * @param examId 考试ID
+     * @param courseCode 课程代码
+     * @return BasicPrintConfig
+     */
+    BasicPrintConfig getByExamIdAndCourseCode(Long examId, String courseCode);
+
+    /**
+     * 根据课程代码和试卷编号获取印品
+     * @param courseCode 课程代码
+     * @param paperNumber 试卷编号
+     * @return BasicPrintConfig
+     */
+    BasicPrintConfig getByCourseCodeAndPaperNumber(String courseCode, String paperNumber);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicPrintConfigServiceImpl.java

@@ -6,16 +6,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.BasicPrintConfigDto;
-import com.qmth.teachcloud.common.entity.BasicPrintConfig;
 import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
+import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicPrintConfigMapper;
 import com.qmth.distributed.print.business.service.BasicPrintConfigService;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
+import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicPrintConfig;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
@@ -41,7 +44,10 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
     private BasicTemplateOrgService basicTemplateOrgService;
 
     @Resource
-    private SysOrgService sysOrgService;
+    private ExamTaskService examTaskService;
+
+    @Resource
+    private BasicCourseService basicCourseService;
 
     @Override
     public IPage<BasicPrintConfigDto> listPage(Long examId, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
@@ -52,7 +58,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
             printConfigDtoIPage.getRecords().forEach(m -> {
                 //查询适用学院
                 List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(TemplateTypeEnum.PRINT_CONFIG.name(), Long.valueOf(m.getId()));
-                if(sysOrgs!=null && sysOrgs.size() > 0){
+                if (sysOrgs != null && sysOrgs.size() > 0) {
                     String orgNames = sysOrgs.stream().map(SysOrg::getName).collect(Collectors.joining(","));
                     m.setOrgNames(orgNames);
                 }
@@ -88,7 +94,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
             if (basicTemplateOrgList != null && basicTemplateOrgList.size() > 0) {
 //                List<Long> useOrgIds = basicTemplateOrgList.stream().map(BasicTemplateOrg::getOrgId).collect(Collectors.toList());
 //                List<SysOrg> sysOrgList = sysOrgService.findByOrgIds(useOrgIds);
-                throw ExceptionResultEnum.ERROR.exception("有"+basicTemplateOrgList.size()+"个机构已经设置了印品，不能重复设置");
+                throw ExceptionResultEnum.ERROR.exception("有" + basicTemplateOrgList.size() + "个机构已经设置了印品，不能重复设置");
             }
 
             basicPrintConfig.setId(SystemConstant.getDbUuid());
@@ -107,7 +113,7 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
             if (basicTemplateOrgList != null && basicTemplateOrgList.size() > 0) {
 //                List<Long> useOrgIds = basicTemplateOrgList.stream().map(BasicTemplateOrg::getOrgId).collect(Collectors.toList());
 //                List<SysOrg> sysOrgList = sysOrgService.findByOrgIds(useOrgIds);
-                throw ExceptionResultEnum.ERROR.exception("有"+basicTemplateOrgList.size()+"个机构已经设置了印品，不能重复设置");
+                throw ExceptionResultEnum.ERROR.exception("有" + basicTemplateOrgList.size() + "个机构已经设置了印品，不能重复设置");
             }
 
             basicPrintConfig.setUpdateId(sysUser.getId());
@@ -124,4 +130,45 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
 
         return isSuccess;
     }
+
+    @Override
+    public BasicPrintConfig getByExamIdAndCourseCode(Long examId, String courseCode) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        // 查询科目所属教研室
+        Long orgId = basicCourseService.getOrgIdBySchoolIdAndCourseCode(schoolId, courseCode);
+        if (orgId == null) {
+            throw ExceptionResultEnum.ERROR.exception("未找到课程所属机构");
+        }
+        List<BasicPrintConfig> basicPrintConfigs = this.baseMapper.listBySchoolIdAndExamIdAndOrgId(schoolId, examId, orgId, TemplateTypeEnum.PRINT_CONFIG.name());
+        if (basicPrintConfigs == null || basicPrintConfigs.size() == 0) {
+            throw ExceptionResultEnum.ERROR.exception("查询出多个印品配置");
+        }
+        if (basicPrintConfigs.size() != 1) {
+            throw ExceptionResultEnum.ERROR.exception("查询出多个印品配置");
+        }
+        return basicPrintConfigs.get(0);
+    }
+
+    @Override
+    public BasicPrintConfig getByCourseCodeAndPaperNumber(String courseCode, String paperNumber) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+
+        // 查询科目所属教研室
+        Long orgId = basicCourseService.getOrgIdBySchoolIdAndCourseCode(schoolId, courseCode);
+        if (orgId == null) {
+            throw ExceptionResultEnum.ERROR.exception("未找到课程所属机构");
+        }
+        ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
+        if(examTask == null){
+            throw ExceptionResultEnum.ERROR.exception("命题任务不存在");
+        }
+        List<BasicPrintConfig> basicPrintConfigs = this.baseMapper.listBySchoolIdAndExamIdAndOrgId(schoolId, examTask.getExamId(), orgId, TemplateTypeEnum.PRINT_CONFIG.name());
+        if (basicPrintConfigs == null || basicPrintConfigs.size() == 0) {
+            throw ExceptionResultEnum.ERROR.exception("查询出多个印品配置");
+        }
+        if (basicPrintConfigs.size() != 1) {
+            throw ExceptionResultEnum.ERROR.exception("查询出多个印品配置");
+        }
+        return basicPrintConfigs.get(0);
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -24,6 +24,7 @@ import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.util.CreatePdfUtil;
 import com.qmth.distributed.print.business.util.HtmlToPdfUtil;
 import com.qmth.teachcloud.common.annotation.ExcelDBFieldDesc;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.bean.dto.excel.*;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -168,6 +169,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Lazy
     PrintCommonService printCommonService;
 
+    @Resource
+    private BasicPrintConfigService basicPrintConfigService;
+
     /**
      * 创建pdf前置条件
      *
@@ -228,7 +232,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
      */
     @Transactional
     public List<BasicAttachment> createPdfCoreLogic(List<ExamDetailCourse> examDetailCourseList,
-                                                    ExamPrintPlan examPrintPlan,
                                                     ExamDetail examDetail,
                                                     SysUser sysUser,
                                                     String paperTypeParam,
@@ -237,11 +240,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                                                     List<PdfDto>... list
     ) throws Exception {
         if (Objects.nonNull(examDetailCourseList) && examDetailCourseList.size() > 0) {
-            String printContent = examPrintPlan.getPrintContent();
-            if (StringUtils.isBlank(printContent)) {
-                return null;
-            }
-
             Map<Long, BasicCardRule> basicCardRuleMap = new HashMap<>();
             for (ExamDetailCourse examDetailCourse : examDetailCourseList) {
                 List<PdfDto> paperPdfTempList = new ArrayList<>();//所有试卷
@@ -249,6 +247,13 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 List<PdfDto> backupPaperTempPdfList = new ArrayList<>();//备份试卷
                 List<PdfDto> cardPdfTempList = new ArrayList<>();//备份题卡
 
+                // 印品
+                BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByCourseCodeAndPaperNumber(examDetailCourse.getCourseCode(), examDetailCourse.getPaperNumber());
+
+                String printContent = basicPrintConfig.getPrintContent();
+                if (StringUtils.isBlank(printContent)) {
+                    return null;
+                }
                 //查询试卷
                 List<ExamTask> examTaskList = examTaskService.findByFlowStatus(sysUser.getSchoolId()
                         , examDetailCourse.getCourseCode()
@@ -258,7 +263,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 if (Objects.isNull(examTaskList) || examTaskList.size() == 0) {
                     throw ExceptionResultEnum.EXAM_TASK_IS_NULL.exception();
                 }
-                Set<Long> examTaskIds = examTaskList.stream().map(s -> s.getId()).collect(Collectors.toSet());
+                Set<Long> examTaskIds = examTaskList.stream().map(ExamTask::getId).collect(Collectors.toSet());
                 Map<Long, ExamTask> examTaskMap = examTaskList.stream().collect(
                         Collectors.toMap(ExamTask::getId, Function.identity(), (dto1, dto2) -> dto1));
 
@@ -302,7 +307,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         paperType = paperTypeParam;
                         CreatePdfCacheUtil.setPaperType(key, paperType);
                     } else {
-                        paperType = createPdfUtil.getPaperType(examPrintPlan, examTaskDetail, key);//抽取卷型
+                        paperType = createPdfUtil.getPaperType(basicPrintConfig.getDrawRule(), examTaskDetail, key);//抽取卷型
                     }
                     examTaskDetail.setRelatePaperType(paperType);
                     examDetailCourse.setPaperType(paperType);
@@ -327,7 +332,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         paperPdfDto = createPdfUtil.getPaperPdfFile(paperType, examTaskDetail);
 
                         //获取试卷pdf
-                        PdfDto pdfDto = createPdfUtil.getPaperPdf(paperPdfDto, examPrintPlan.getBackupCount(), backupPaperTempPdfList);
+                        PdfDto pdfDto = createPdfUtil.getPaperPdf(paperPdfDto, basicPrintConfig.getBackupCount(), backupPaperTempPdfList);
                         if (Objects.nonNull(pdfDto)) {
                             examDetailCourse.setPaperPagesA3(pdfDto.getPageCount());
                         } else {
@@ -354,7 +359,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             String cardContent = createPdfUtil.replaceHtmlTemplete(examCardDetail);
                             String studentContent = examCardDetail.getHtmlContent();
 
-                            for (int i = 1; i <= examPrintPlan.getBackupCount(); i++) {
+                            for (int i = 1; i <= basicPrintConfig.getBackupCount(); i++) {
                                 BasicAttachment basicAttachment = createPdfUtil.cardHtml(String.format("%02d", i), cardContent, examDetail, examDetailCourse, examCard, jsonArray, sysUser.getId(), cardPdfTempList, basicCardRule);
                                 examDetailCourse.setCardPagesA3(basicAttachment.getPages());
                                 basicAttachmentList.add(basicAttachment);
@@ -505,7 +510,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
                 //创建pdf核心逻辑
                 basicAttachmentList = createPdfCoreLogic(examDetailCourseList,
-                        examPrintPlan,
                         examDetail,
                         sysUser,
                         paperTypeParam,

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -11,7 +11,7 @@ import com.qmth.distributed.print.business.bean.dto.PaperPdfDto;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.cache.CreatePdfCacheUtil;
 import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.DrawRuleEnum;
+import com.qmth.teachcloud.common.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintMethodEnum;
 import com.qmth.distributed.print.business.service.ExamDetailService;
@@ -535,14 +535,14 @@ public class CreatePdfUtil {
     /**
      * 抽取试卷
      *
-     * @param examPrintPlan
+     * @param drawRule
      * @param examTaskDetail
      * @param key
      * @return
      */
-    public String getPaperType(ExamPrintPlan examPrintPlan, ExamTaskDetail examTaskDetail, String key) {
+    public String getPaperType(DrawRuleEnum drawRule, ExamTaskDetail examTaskDetail, String key) {
         //抽取卷型
-        DrawRuleEnum drawRule = Objects.nonNull(examPrintPlan.getDrawRule()) ? examPrintPlan.getDrawRule() : DrawRuleEnum.ONE;
+        drawRule = Objects.nonNull(drawRule) ? drawRule : DrawRuleEnum.ONE;
         //未曝光卷型
         String unexposedPaperType = examTaskDetail.getUnexposedPaperType();
         //已曝光卷型

distributed-print-business/src/main/resources/mapper/BasicPrintConfigMapper.xml

@@ -47,4 +47,18 @@
             </if>
         </where>
     </select>
+    <select id="listBySchoolIdAndExamIdAndOrgId" resultMap="BaseResultMap">
+        SELECT
+            *
+        FROM
+            basic_print_config a
+                JOIN
+            basic_template_org b ON a.school_id = b.school_id
+                AND a.id = b.rule_id
+        WHERE
+            a.school_id = #{schoolId}
+          AND a.exam_id = #{examId}
+          AND b.org_id = #{orgId}
+          AND b.type = #{type}
+    </select>
 </mapper>

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -103,19 +103,18 @@ public class ExamTaskController {
 
     /**
      * 命题任务管理-查询
-     *
-     * @param enable
-     * @param status
-     * @param cardRuleId
-     * @param courseCode
-     * @param paperNumber
-     * @param startTime
-     * @param endTime
-     * @param userName    命题教师姓名
-     * @param createName  创建人姓名
-     * @param pageNumber
-     * @param pageSize
-     * @return
+     * @param enable 正常/禁用
+     * @param status 状态
+     * @param cardRuleId 题卡规则ID
+     * @param courseCode 课程代码
+     * @param paperNumber 试卷编号
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param userName 命题老师名称
+     * @param createName 创建人名称
+     * @param pageNumber 分页参数
+     * @param pageSize 分页参数
+     * @return Result
      */
     @ApiOperation(value = "命题任务管理-查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
@@ -136,8 +135,6 @@ public class ExamTaskController {
     /**
      * 试卷编号模糊查询
      *
-     * @param param
-     * @return
      */
     @ApiOperation(value = "试卷编号模糊查询")
     @RequestMapping(value = "/paper_number_query", method = RequestMethod.POST)
@@ -154,8 +151,6 @@ public class ExamTaskController {
     /**
      * 命题老师模糊查询
      *
-     * @param param
-     * @return
      */
     @ApiOperation(value = "命题老师模糊查询")
     @RequestMapping(value = "/user_query", method = RequestMethod.POST)
@@ -166,8 +161,6 @@ public class ExamTaskController {
     /**
      * 命题任务管理-更改/指派命题老师
      *
-     * @param examTask
-     * @return
      */
     @ApiOperation(value = "命题任务管理-更改/指派命题老师")
     @RequestMapping(value = "/assign_user", method = RequestMethod.POST)
@@ -178,8 +171,6 @@ public class ExamTaskController {
     /**
      * 命题任务管理-启用/禁用
      *
-     * @param examTask
-     * @return
      */
     @ApiOperation(value = "命题任务管理-启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
@@ -190,8 +181,6 @@ public class ExamTaskController {
     /**
      * 命题任务管理-新建命题任务
      *
-     * @param examTask
-     * @return
      */
     @ApiOperation(value = "命题任务管理-新建命题任务")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
@@ -207,8 +196,6 @@ public class ExamTaskController {
     /**
      * 命题任务管理-文件导入
      *
-     * @param file
-     * @return
      */
     @ApiOperation(value = "命题任务管理-文件导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
@@ -238,8 +225,6 @@ public class ExamTaskController {
     /**
      * 命题任务管理-批量保存命题任务
      *
-     * @param task
-     * @return
      */
     @ApiOperation(value = "命题任务管理-批量保存命题任务")
     @RequestMapping(value = "/save_batch", method = RequestMethod.POST)
@@ -256,8 +241,6 @@ public class ExamTaskController {
     /**
      * 审核历史
      *
-     * @param flowId
-     * @return
      */
     @ApiOperation(value = "审核历史")
     @RequestMapping(value = "/review_list", method = RequestMethod.POST)
@@ -296,8 +279,8 @@ public class ExamTaskController {
     /**
      * 根据命题任务ID查询单个数据
      *
-     * @param examTaskId
-     * @return
+     * @param examTaskId 命题任务ID
+     * @return Result
      */
     @ApiOperation(value = "根据命题任务ID查询单个数据")
     @RequestMapping(value = "/exam_task_get_one", method = RequestMethod.POST)
@@ -309,8 +292,8 @@ public class ExamTaskController {
     /**
      * 根据命题任务ID查询单个数据
      *
-     * @param examTaskId
-     * @return
+     * @param examTaskId 命题任务ID
+     * @return Result
      */
     @ApiOperation(value = "根据命题任务ID查询单个数据")
     @RequestMapping(value = "/apply_get_one", method = RequestMethod.POST)
@@ -337,8 +320,8 @@ public class ExamTaskController {
     /**
      * 入库申请-暂存/提交
      *
-     * @param examTaskDetail
-     * @return
+     * @param examTaskDetail 命题任务详情对象
+     * @return Result
      */
     @ApiOperation(value = "入库申请-暂存/提交")
     @RequestMapping(value = "/apply_save", method = RequestMethod.POST)
@@ -363,8 +346,8 @@ public class ExamTaskController {
     /**
      * 入库申请-撤销申请
      *
-     * @param examTask
-     * @return
+     * @param examTask 命题任务对象
+     * @return Result
      */
     @ApiOperation(value = "入库申请-撤销申请")
     @RequestMapping(value = "/apply_status", method = RequestMethod.POST)
@@ -407,18 +390,18 @@ public class ExamTaskController {
     /**
      * 入库审核-查询-未审核
      *
-     * @param courseCode
-     * @param paperNumber
-     * @param userId
-     * @param cardRuleId
-     * @param startTime
-     * @param endTime
+     * @param courseCode 课程代码
+     * @param paperNumber 试卷编号
+     * @param userId 命题老师ID
+     * @param cardRuleId 题卡规则ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @param startCreateTime 申请时间-起始
      * @param endCreateTime   申请时间-终止
      * @param createName      创建人
-     * @param pageNumber
-     * @param pageSize
-     * @return
+     * @param pageNumber 分页参数
+     * @param pageSize 分页参数
+     * @return Result
      */
     @ApiOperation(value = "入库审核-查询-已审核")
     @RequestMapping(value = "/review_list_audited", method = RequestMethod.POST)
@@ -441,8 +424,8 @@ public class ExamTaskController {
     /**
      * 审核
      *
-     * @param taskReviewLog
-     * @return
+     * @param taskReviewLog 审核对象
+     * @return Result
      */
     @ApiOperation(value = "审核")
     @RequestMapping(value = "/review_save", method = RequestMethod.POST)
@@ -467,8 +450,8 @@ public class ExamTaskController {
     /**
      * 入库审核-批量审核
      *
-     * @param taskReviewLog
-     * @return
+     * @param taskReviewLog 审核对象
+     * @return Result
      */
     @ApiOperation(value = "入库审核-批量审核")
     @RequestMapping(value = "/review_save_batch", method = RequestMethod.POST)
@@ -527,13 +510,13 @@ public class ExamTaskController {
     /**
      * 卷库查询
      *
-     * @param courseCode
-     * @param paperNumber
-     * @param startTime
-     * @param endTime
-     * @param pageNumber
-     * @param pageSize
-     * @return
+     * @param courseCode 课程代码
+     * @param paperNumber 试卷编号
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNumber 分页参数
+     * @param pageSize 分页参数
+     * @return Result
      */
     @ApiOperation(value = "卷库查询")
     @RequestMapping(value = "/paper_list", method = RequestMethod.POST)
@@ -552,8 +535,7 @@ public class ExamTaskController {
     /**
      * 下载
      *
-     * @param response
-     * @param examTaskId
+     * @param examTaskId 命题任务ID
      */
     @ApiOperation(value = "下载")
     @RequestMapping(value = "/paper_download", method = RequestMethod.POST)
@@ -564,8 +546,8 @@ public class ExamTaskController {
     /**
      * 卷库查询-启用/禁用
      *
-     * @param examTaskDetail
-     * @return
+     * @param examTaskDetail 命题任务详情对象
+     * @return Result
      */
     @ApiOperation(value = "卷库查询-启用/禁用")
     @RequestMapping(value = "/paper_enable", method = RequestMethod.POST)
@@ -588,8 +570,8 @@ public class ExamTaskController {
     /**
      * 卷库查询-卷库修改
      *
-     * @param examTaskDetail
-     * @return
+     * @param examTaskDetail 命题任务详情对象
+     * @return Result
      */
     @ApiOperation(value = "卷库查询-卷库修改")
     @RequestMapping(value = "/paper_update", method = RequestMethod.POST)
@@ -629,8 +611,8 @@ public class ExamTaskController {
     /**
      * 班级列表
      *
-     * @param courseCode
-     * @return
+     * @param courseCode 课程代码
+     * @return Result
      */
     @ApiOperation(value = "命题任务管理-命题申请-班级列表")
     @RequestMapping(value = "/list_task_apply_class", method = RequestMethod.POST)

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicPrintConfig.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import com.qmth.teachcloud.common.enums.DrawRuleEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -68,7 +69,7 @@ public class BasicPrintConfig extends BaseEntity implements Serializable {
      * 抽卷规则（ONE只抽一次，CIRCLE循环抽取）
      */
     @TableField("draw_rule")
-    private String drawRule;
+    private DrawRuleEnum drawRule;
 
     /**
      * 变量印品参数json
@@ -142,11 +143,11 @@ public class BasicPrintConfig extends BaseEntity implements Serializable {
         this.backupCount = backupCount;
     }
 
-    public String getDrawRule() {
+    public DrawRuleEnum getDrawRule() {
         return drawRule;
     }
 
-    public void setDrawRule(String drawRule) {
+    public void setDrawRule(DrawRuleEnum drawRule) {
         this.drawRule = drawRule;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/DrawRuleEnum.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/DrawRuleEnum.java

@@ -1,6 +1,4 @@
-package com.qmth.distributed.print.business.enums;
-
-import com.qmth.teachcloud.common.enums.EnumResult;
+package com.qmth.teachcloud.common.enums;
 
 import java.util.ArrayList;
 import java.util.List;