题卡type非必填

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.teachcloud.common.enums.ClassifyEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -24,9 +23,6 @@ public class TemplatePrintInfoResult {
     @ApiModelProperty(value = "模板名称")
     private String templateName;
 
-    @ApiModelProperty(value = "模板类型")
-    private TemplateTypeEnum templateType;
-
     @ApiModelProperty(value = "模板样式")
     private ClassifyEnum templateClassify;
 
@@ -64,14 +60,6 @@ public class TemplatePrintInfoResult {
         this.templateName = templateName;
     }
 
-    public TemplateTypeEnum getTemplateType() {
-        return templateType;
-    }
-
-    public void setTemplateType(TemplateTypeEnum templateType) {
-        this.templateType = templateType;
-    }
-
     public ClassifyEnum getTemplateClassify() {
         return templateClassify;
     }
@@ -110,7 +98,6 @@ public class TemplatePrintInfoResult {
                 "templateId=" + templateId +
                 ", schoolId=" + schoolId +
                 ", templateName='" + templateName + '\'' +
-                ", templateType=" + templateType +
                 ", templateClassify=" + templateClassify +
                 ", attachmentId=" + attachmentId +
                 ", enable=" + enable +

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

@@ -38,10 +38,7 @@ public class BasicTemplate extends BaseEntity implements Serializable {
      * 模板名称
      */
     private String name;
-    /**
-     * 模板类型：GENERIC-通卡模板，VARIABLE-变量印品模板，ORDINARY-普通印品模板
-     */
-//    private TemplateTypeEnum type;
+
     /**
      * template_type值为VARIABLE、ORDINARY时，不为空。
      * SIGN-签到表，PACKAGE-卷袋贴，CHECK_IN-登记表
@@ -105,14 +102,6 @@ public class BasicTemplate extends BaseEntity implements Serializable {
         this.name = name;
     }
 
-//    public TemplateTypeEnum getType() {
-//        return type;
-//    }
-//
-//    public void setType(TemplateTypeEnum type) {
-//        this.type = type;
-//    }
-
     public ClassifyEnum getClassify() {
         return classify;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TemplateTypeEnum.java

@@ -12,9 +12,6 @@ import java.util.List;
  */
 public enum TemplateTypeEnum {
 
-    GENERIC("通卡模板"),
-    VARIABLE("变量印品模板"),
-    ORDINARY("普通印品模板"),
     PRINT_CONFIG("印品配置"),
     CARD_RULE("题卡规则");
 

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

@@ -14,7 +14,10 @@ import com.qmth.distributed.print.business.bean.result.PrintPlanBrief;
 import com.qmth.distributed.print.business.bean.result.PrintPlanResult;
 import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
 import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.*;
+import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
+import com.qmth.distributed.print.business.enums.ExamPrintPlanSyncStatusEnum;
+import com.qmth.distributed.print.business.enums.MessageEnum;
+import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamPrintPlanMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCloudMarkingTaskService;
@@ -203,7 +206,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         // 变量印品
         List<Map<String, Object>> variable = new ArrayList<>();
         List<TemplatePrintInfoResult> variableList = templateInfoList.stream()
-                .filter(e -> TemplateTypeEnum.VARIABLE.equals(e.getTemplateType()))
+                .filter(e -> ClassifyEnum.SIGN == e.getTemplateClassify() || ClassifyEnum.PACKAGE == e.getTemplateClassify())
                 .collect(Collectors.toList());
         for (ClassifyEnum value : ClassifyEnum.values()) {
             Map<String, Object> variableMap = new HashMap<>();
@@ -226,7 +229,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         // 普通印品
         List<Map<String, Object>> ordinary = new ArrayList<>();
         List<TemplatePrintInfoResult> ordinaryList = templateInfoList.stream()
-                .filter(e -> TemplateTypeEnum.ORDINARY.equals(e.getTemplateType()))
+                .filter(e -> ClassifyEnum.CHECK_IN == e.getTemplateClassify())
                 .collect(Collectors.toList());
         Map<String, Object> ordinaryMap = new HashMap<>();
         for (ClassifyEnum value : ClassifyEnum.values()) {

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

@@ -76,7 +76,6 @@
         FROM basic_template tmp
         <where>
             and tmp.enable = true
-            AND (tmp.type = 'VARIABLE' OR tmp.type = 'ORDINARY')
             <if test="orgIds != null and orgIds != '' and orgIds.size() > 0">
                 AND tmp.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">

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

@@ -44,7 +44,6 @@
         basic_template tmp ON org.rule_id = tmp.id
         <where>
             and tmp.enable = true
-            AND (tmp.type = 'VARIABLE' OR tmp.type = 'ORDINARY')
             <if test="orgIds.size() == 0">
                 AND org.org_id IN (null)
             </if>