3.3.1 update

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

@@ -1320,18 +1320,10 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         ExamCard examCard = examCardService.getById(cardId);
                         Optional.ofNullable(examCard).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("找不到答题卡"));
 
-                        MakeMethodEnum makeMethodEnum = examCard.getMakeMethod();
-
                         String cardHtmlPath = dirPath + "题卡" + SystemConstant.HYPHEN + name + SystemConstant.HTML_PREFIX;
                         String cardPdfPath = dirPath + "题卡" + SystemConstant.HYPHEN + name + SystemConstant.PDF_PREFIX;
                         // 通用题卡
-                        String htmlContent;
-                        if (MakeMethodEnum.SELECT.equals(makeMethodEnum)) {
-                            htmlContent = createPdfUtil.resetHtmlTemplateBar(examCard.getHtmlContent());
-                        } else {
-                            BasicCardRule basicCardRule = basicCardRuleService.getById(examTask.getCardRuleId());
-                            htmlContent = createPdfUtil.replaceHtmlCardAllParams(examCard, basicCardRule);
-                        }
+                        String htmlContent = createPdfNewUtil.replaceBlankHtmlContent(examCard.getHtmlContent());
                         // html
                         File localFile = new File(cardHtmlPath);
                         if (!localFile.exists()) {

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

@@ -167,7 +167,7 @@ public class ExamPrintTaskController {
      */
     @ApiOperation(value = "印刷任务管理-批量完成/撤回/提交")
     @RequestMapping(value = "/task_batch_cancel", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @OperationLogDetail(detail = "批量完成/撤回/提交", customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     public Result taskCancel(@RequestBody Map data) {
         boolean isSuccess = examDetailService.taskBatchCancel(data);
         return ResultUtil.ok(isSuccess);