修改entity

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

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.ExamNumberStyleEnum;
 import com.qmth.distributed.print.business.enums.PaperTypeEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -23,9 +24,16 @@ public class BasicCardRule extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 题卡规则名称
      */
@@ -92,6 +100,9 @@ public class BasicCardRule extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private Long[] orgIds;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 
     public Long getSchoolId() {
         return schoolId;
@@ -101,6 +112,14 @@ public class BasicCardRule extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.PrintMethodEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -22,9 +23,16 @@ public class BasicExamRule extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 必选字段
      */
@@ -55,6 +63,10 @@ public class BasicExamRule extends BaseEntity implements Serializable {
     @TableField("print_method")
     private PrintMethodEnum printMethod;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -63,6 +75,14 @@ public class BasicExamRule extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getRequiredFields() {
         return requiredFields;
     }

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.MessageEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -19,6 +20,16 @@ public class BasicMessage extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 用户ID
      */
@@ -93,6 +104,26 @@ public class BasicMessage extends BaseEntity implements Serializable {
     @TableField("resend_count")
     private Integer resendCount;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getUserId() {
         return userId;
     }

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

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.enums.ClassifyEnum;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -23,9 +24,16 @@ public class BasicTemplate extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 模板名称
      */
@@ -36,7 +44,7 @@ public class BasicTemplate extends BaseEntity implements Serializable {
     private TemplateTypeEnum type;
     /**
      * template_type值为VARIABLE、ORDINARY时，不为空。
-            SIGN-签到表，PACKAGE-卷袋贴，CHECK_IN-登记表
+     * SIGN-签到表，PACKAGE-卷袋贴，CHECK_IN-登记表
      */
     private ClassifyEnum classify;
     /**
@@ -61,8 +69,11 @@ public class BasicTemplate extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String url;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 
-   public Long getSchoolId() {
+    public Long getSchoolId() {
         return schoolId;
     }
 
@@ -70,6 +81,14 @@ public class BasicTemplate extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -6,6 +6,7 @@ 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.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -22,6 +23,16 @@ public class BasicTemplateOrg extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 模板类型：GENERIC-通卡模板，VARIABLE-变量印品模板，ORDINARY-普通印品模板，CARD_RULE-题卡规则
      */
@@ -32,12 +43,26 @@ public class BasicTemplateOrg extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("rule_id")
     private Long ruleId;
-    /**
-     * 组织机构ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
-    private Long orgId;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
 
     public TemplateTypeEnum getType() {
         return type;
@@ -54,12 +79,4 @@ public class BasicTemplateOrg extends BaseEntity implements Serializable {
     public void setRuleId(Long ruleId) {
         this.ruleId = ruleId;
     }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicVerifyCode.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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -21,6 +22,16 @@ public class BasicVerifyCode extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 用户ID
      */
@@ -48,6 +59,26 @@ public class BasicVerifyCode extends BaseEntity implements Serializable {
     @TableField("verify_code")
     private String verifyCode;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getUserId() {
         return userId;
     }

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

@@ -1,11 +1,10 @@
 package com.qmth.distributed.print.business.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -19,19 +18,20 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("client_print_data")
-public class ClientPrintData implements Serializable {
+public class ClientPrintData extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
 
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 机器唯一码
      */
@@ -56,23 +56,8 @@ public class ClientPrintData implements Serializable {
     @TableField("pages_a3")
     private Integer pagesA3;
 
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("create_id")
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    @ApiModelProperty(value = "创建时间")
-    private Long createTime;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
     public Long getSchoolId() {
@@ -83,6 +68,14 @@ public class ClientPrintData implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getMachineCode() {
         return machineCode;
     }
@@ -114,20 +107,4 @@ public class ClientPrintData implements Serializable {
     public void setPagesA3(Integer pagesA3) {
         this.pagesA3 = pagesA3;
     }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientStatus.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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -21,10 +22,16 @@ public class ClientStatus extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
 
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 机器唯一码
      */
@@ -84,6 +91,10 @@ public class ClientStatus extends BaseEntity implements Serializable {
     @TableField("is_download")
     private Boolean isDownload;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -92,6 +103,14 @@ public class ClientStatus extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getMachineCode() {
         return machineCode;
     }

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

@@ -8,6 +8,7 @@ import com.qmth.distributed.print.business.enums.CardStatusEnum;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -24,9 +25,16 @@ public class ExamCard extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 课程编码
      */
@@ -61,6 +69,10 @@ public class ExamCard extends BaseEntity implements Serializable {
     @TableField("sync_status")
     private Boolean syncStatus;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -69,6 +81,14 @@ public class ExamCard extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getCourseCode() {
         return courseCode;
     }

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

@@ -27,9 +27,12 @@ public class ExamCardDetail extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("card_id")
     private Long cardId;
+
     private String content;
+
     @TableField("html_content")
     private String htmlContent;
+
     @TableField("attachment_id")
     private String attachmentId;
 

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

@@ -23,15 +23,23 @@ public class ExamDetail extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 印刷计划ID
      */
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("print_plan_id")
     private Long printPlanId;
+
     @TableField("print_plan_name")
     private String printPlanName;
     /**
@@ -39,8 +47,10 @@ public class ExamDetail extends BaseEntity implements Serializable {
      */
     @TableField("exam_start_time")
     private Long examStartTime;
+
     @TableField("exam_end_time")
     private Long examEndTime;
+
     @TableField("exam_place")
     private String examPlace;
     /**
@@ -48,8 +58,10 @@ public class ExamDetail extends BaseEntity implements Serializable {
      */
     @TableField("total_subjects")
     private Integer totalSubjects;
+
     @TableField("exam_room")
     private String examRoom;
+
     @TableField("print_progress")
     private Double printProgress;
     /**
@@ -87,6 +99,22 @@ public class ExamDetail extends BaseEntity implements Serializable {
     @TableField("attachment_path")
     private String attachmentPath;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getAttachmentPath() {
         return attachmentPath;
     }
@@ -107,14 +135,6 @@ public class ExamDetail extends BaseEntity implements Serializable {
         this.attachmentId = attachmentId;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
     public Long getPrintPlanId() {
         return printPlanId;
     }

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

@@ -22,17 +22,26 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
 
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("exam_detail_id")
     private Long examDetailId;
+
     @TableField("course_code")
     private String courseCode;
+
     @TableField("course_name")
     private String courseName;
+
     @TableField("paper_number")
     private String paperNumber;
 
@@ -53,6 +62,22 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
     @TableField("attachment_id")
     private String attachmentId;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getAttachmentId() {
         return attachmentId;
     }
@@ -69,14 +94,6 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
         this.paperType = paperType;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
     public Long getExamDetailId() {
         return examDetailId;
     }

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

@@ -8,6 +8,7 @@ import com.qmth.distributed.print.business.enums.BackupMethodEnum;
 import com.qmth.distributed.print.business.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -24,9 +25,16 @@ public class ExamPrintPlan extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 印刷计划名称
      */
@@ -96,6 +104,10 @@ public class ExamPrintPlan extends BaseEntity implements Serializable {
     @TableField("sync_status")
     private Boolean syncStatus;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -104,6 +116,14 @@ public class ExamPrintPlan extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -22,25 +22,40 @@ public class ExamStudent extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     @TableField("exam_detail_course_id")
     private Long examDetailCourseId;
+
     @TableField("student_name")
     private String studentName;
+
     @TableField("student_code")
     private String studentCode;
+
     @TableField("ticket_number")
     private String ticketNumber;
+
     @TableField("site_number")
     private String siteNumber;
+
     @TableField("print_paper")
     private Integer printPaper;
+
     @TableField("print_card")
     private Integer printCard;
+
     @TableField("extend_fields")
     private String extendFields;
+
     @TableField("paper_type")
     private String paperType;
 
@@ -48,9 +63,26 @@ public class ExamStudent extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "附件id")
     @TableField(value = "attachment_id")
     private Long attachmentId;
+
     @TableField(value = "sync_status")
     private Boolean syncStatus;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -63,14 +95,6 @@ public class ExamStudent extends BaseEntity implements Serializable {
         this.attachmentId = attachmentId;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
     public Long getExamDetailCourseId() {
         return examDetailCourseId;
     }

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

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.List;
@@ -25,10 +26,16 @@ public class ExamTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
 
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 课程代码
      */
@@ -94,6 +101,10 @@ public class ExamTask extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private List<Map<String, String>> users;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -102,6 +113,14 @@ public class ExamTask extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getCourseCode() {
         return courseCode;
     }

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

@@ -75,8 +75,10 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
      */
     @TableField("exposed_paper_type")
     private String exposedPaperType;
+
     @TableField("relate_paper_type")
     private String relatePaperType;
+
     @TableField("unexposed_paper_type")
     private String unexposedPaperType;
 
@@ -85,7 +87,6 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String operateType;
 
-
     public Long getExamTaskId() {
         return examTaskId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskTemp.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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -21,9 +22,16 @@ public class ExamTaskTemp extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 本次导入数据临时ID
      */
@@ -55,6 +63,18 @@ public class ExamTaskTemp extends BaseEntity implements Serializable {
     @TableField("user_name")
     private String userName;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
 import io.swagger.annotations.ApiModel;
@@ -19,19 +20,19 @@ import java.io.Serializable;
  * </p>
  */
 @ApiModel(value = "TBSyncTask对象", description = "同步任务表")
-public class TBSyncTask implements Serializable {
+public class TBSyncTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
+    @TableField("school_id")
+    private Long schoolId;
 
+    @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    @TableField(value = "school_id")
-    private Long schoolId;
+    @TableField("org_id")
+    private Long orgId;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "印刷计划id")
@@ -54,15 +55,6 @@ public class TBSyncTask implements Serializable {
     @TableField(value = "result")
     private TaskResultEnum result;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
-    private Long createTime;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "创建人id")
-    @TableField("create_id")
-    private Long createId;
-
     @ApiModelProperty(value = "备注")
     @TableField(value = "remark")
     private String remark;
@@ -75,12 +67,16 @@ public class TBSyncTask implements Serializable {
     @TableField(value = "error_message", updateStrategy = FieldStrategy.IGNORED)
     private String errorMessage;
 
-    public Long getId() {
-        return id;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getOrgId() {
+        return orgId;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
     }
 
     public Long getSchoolId() {
@@ -131,22 +127,6 @@ public class TBSyncTask implements Serializable {
         this.result = result;
     }
 
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
     public String getRemark() {
         return remark;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/base/BaseEntity.java

@@ -26,7 +26,7 @@ public class BaseEntity implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("create_id")
-    @ApiModelProperty(value = "创建人id")
+    @ApiModelProperty(value = "创建人")
     private Long createId;
 
     @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
@@ -35,7 +35,7 @@ public class BaseEntity implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("update_id")
-    @ApiModelProperty(value = "修改人id")
+    @ApiModelProperty(value = "修改人")
     private Long updateId;
 
     @TableField(value = "update_Time", fill = FieldFill.INSERT_UPDATE) // 新增和更新执行