Merge remote-tracking branch 'origin/dev_v3.0.2' into dev_v3.0.2

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

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.entity;
 
-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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -17,15 +17,10 @@ import java.io.Serializable;
  * @since 2022-05-20
  */
 @ApiModel(value="GradeModuleDefine对象", description="分析-模块二级考察点维度熟练度配置，及模块简要描述表")
-public class GradeModuleDefine implements Serializable {
+public class GradeModuleDefine extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "模块熟练度主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
@@ -60,14 +55,6 @@ public class GradeModuleDefine implements Serializable {
     @ApiModelProperty(value = "取值范围（计算用）")
     private String scope;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.entity;
 
-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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -17,14 +17,10 @@ import java.io.Serializable;
  * @since 2022-05-20
  */
 @ApiModel(value="GradeModuleEvaluation对象", description="校验-考察点模块评价建议表")
-public class GradeModuleEvaluation implements Serializable {
+public class GradeModuleEvaluation extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
@@ -56,14 +52,6 @@ public class GradeModuleEvaluation implements Serializable {
     @ApiModelProperty(value = "学习建议")
     private String advice;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.entity;
 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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -18,15 +19,10 @@ import java.math.BigDecimal;
  * @since 2022-05-20
  */
 @ApiModel(value="GradePaper对象", description="试卷基础信息表（赋分系数、试卷类型、满分、及格分等）")
-public class GradePaper implements Serializable {
+public class GradePaper extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "试卷id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
@@ -58,14 +54,6 @@ public class GradePaper implements Serializable {
     @ApiModelProperty(value = "赋分类型\\n1.NEED_ASSIGN_SCORE('是','需要且按照公式赋分')\\n2.NO_NEED_ASSIGN_SCORE('否','不需要赋分，标准分即为赋分')\\n3.SPECIAL_ASSIGN_SCORE('特殊赋分','特殊赋分，按照excel表进行赋分')")
     private String scoreType;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.entity;
 
-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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -17,14 +17,10 @@ import java.io.Serializable;
  * @since 2022-05-20
  */
 @ApiModel(value="GradePaperDimension对象", description="分析-考察点维度表")
-public class GradePaperDimension implements Serializable {
+public class GradePaperDimension extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
@@ -53,14 +49,6 @@ public class GradePaperDimension implements Serializable {
     @ApiModelProperty(value = "一级维度术语解释")
     private String interpretation;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.entity;
 
-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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -18,14 +18,10 @@ import java.math.BigDecimal;
  * @since 2022-05-20
  */
 @ApiModel(value="GradePaperStruct对象", description="分析-试卷结构（蓝图）表")
-public class GradePaperStruct implements Serializable {
+public class GradePaperStruct extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
@@ -69,14 +65,6 @@ public class GradePaperStruct implements Serializable {
     @ApiModelProperty(value = "素养维度")
     private String literacyDimension;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }