Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

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

@@ -177,4 +177,11 @@ public interface ExamTaskService extends IService<ExamTask> {
     List<ExamTask> findByFlowStatus(Long schoolId, String courseCode, String courseName, String paperNumber, FlowStatusEnum flowStatus);
 
     void removeByExamTaskId(Long examTaskId);
+
+    /**
+     * 查找题卡规则标题
+     * @param cardRuleId 题卡规则主键
+     * @return 标题名称
+     */
+    String findCardTitle(Long cardRuleId);
 }

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

@@ -134,6 +134,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Resource
     TFFlowService tfFlowService;
 
+    @Resource
+    BasicCardRuleService basicCardRuleService;
+
     @Override
     public List<ExamTask> listByCourseCode(Long schoolId, String code) {
         QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
@@ -1320,4 +1323,18 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
         examTaskDetailService.removeById(examTaskDetail.getId());
     }
+
+    @Override
+    public String findCardTitle(Long cardRuleId) {
+        String title = "通用题卡";
+        if (-1L != cardRuleId) {
+            BasicCardRule basicCardRule = basicCardRuleService.getById(cardRuleId);
+            if (Objects.isNull(basicCardRule)) {
+                throw ExceptionResultEnum.ERROR.exception("未找到题卡规则id");
+            }
+            title = basicCardRule.getTitleRule();
+            // TODO: 2021/8/16 title中的动态变量替换规则 
+        }
+        return title;
+    }
 }

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

@@ -141,7 +141,7 @@ public class ExamPrintPlanController {
     @ApiOperation(value = "关联试卷管理-查询")
     @RequestMapping(value = "/relate_list", method = RequestMethod.POST)
     public Result relateList(@RequestParam(value = "relateType", required = false) String relateType,
-                             @RequestParam(value = "printPlanId", required = false) List<String> printPlanIdList,
+                             @RequestParam(value = "printPlanIdList", required = false) List<String> printPlanIdList,
                              @RequestParam(value = "courseCode", required = false) String courseCode,
                              @RequestParam(value = "paperNumber", required = false) String paperNumber,
                              @RequestParam(value = "userName", required = false) String userName,

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

@@ -9,10 +9,7 @@ import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.params.ExamTaskApplyParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.ExamStatusEnum;
-import com.qmth.distributed.print.business.enums.MakeMethodEnum;
-import com.qmth.distributed.print.business.enums.MessageEnum;
-import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
+import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.templete.execute.AsyncTaskReviewSampleExportService;
@@ -724,5 +721,13 @@ public class ExamTaskController {
         return ResultUtil.ok(true, "");
     }
 
+    @ApiOperation(value = "题卡标题查询")
+    @RequestMapping(value = "/find_card_title", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+//    @Aac(auth = BOOL.FALSE)
+    public Result findCardTitle(@ApiParam(value = "题卡规则id",required = true) @RequestParam String cardRuleId) {
+        return ResultUtil.ok((Object) examTaskService.findCardTitle(SystemConstant.convertIdToLong(cardRuleId)));
+    }
+
 }