3.0.0-bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailDto.java

@@ -33,6 +33,9 @@ public class ExamTaskDetailDto {
     private Integer totalSubjects;
     private String examDetailCourseIds;
 
+    private String examName;
+    private String semesterName;
+
     @ApiModelProperty(value = "题卡制作方式：SELECT-选择已有题卡，SELF-自助创建，CUST-客户制卡")
     private MakeMethodEnum makeMethod;
 
@@ -229,4 +232,20 @@ public class ExamTaskDetailDto {
     public void setSetup(Integer setup) {
         this.setup = setup;
     }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
 }

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

@@ -36,7 +36,7 @@ public interface ExamCardService extends IService<ExamCard> {
 
     boolean usedCardByTemplateId(Long id);
 
-    List<ExamCard> listSelectCard(String courseCode, Long cardRuleId, String paperType);
+    List<ExamCard> listSelectCard(String courseCode, Long cardRuleId);
 
     void downloadFiles(HttpServletResponse response, ArraysParams arraysParams) throws Exception;
 

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

@@ -219,7 +219,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     }
 
     @Override
-    public List<ExamCard> listSelectCard(String courseCode, Long cardRuleId, String paperType) {
+    public List<ExamCard> listSelectCard(String courseCode, Long cardRuleId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);

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

@@ -469,6 +469,8 @@
         SELECT
         a.id,
         a.school_id schoolId,
+        be.name examName,
+        bs.name semesterName,
         a.course_code courseCode,
         a.course_name courseName,
         a.specialty,
@@ -505,6 +507,10 @@
         basic_card_rule e ON a.card_rule_id = e.id
         LEFT JOIN
         exam_card f ON b.card_id = f.id
+        LEFT JOIN
+        basic_exam be ON a.exam_id = be.id
+        LEFT JOIN
+        basic_semester bs ON be.semester_id = bs.id
         <where>
             (a.status = 'SUBMIT' and (a.flow_id is null or (a.flow_id is not null and g.status = 'FINISH')))
             <if test="schoolId != null and schoolId != ''">

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

@@ -3,9 +3,9 @@ package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
+import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicExam;
-import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -78,11 +78,12 @@ public class BasicExamController {
     /**
      * 启用/禁用
      *
-     * @param basicExam 参数
+     * @param id     主键
+     * @param enable 禁用标识
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(@ApiParam(value = "考试id", required = true) @RequestParam Long id,
+    public Result enable(@ApiParam(value = "考试ID", required = true) @RequestParam Long id,
                          @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) {
         boolean isSuccess = basicExamService.enable(id, enable);
         return ResultUtil.ok(isSuccess);

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

@@ -181,7 +181,7 @@ public class ExamCardController {
     @RequestMapping(value = "/select_card_list", method = RequestMethod.POST)
     public Result selectCardList(@RequestParam String examId,@RequestParam String courseCode, @RequestParam String paperType) {
         BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamIdAndCourseCode(SystemConstant.convertIdToLong(examId),courseCode);
-        List<ExamCard> list = examCardService.listSelectCard(courseCode, basicPrintConfig.getCardRuleId(), paperType);
+        List<ExamCard> list = examCardService.listSelectCard(courseCode, basicPrintConfig.getCardRuleId());
         return ResultUtil.ok(list);
     }