Ver Fonte

教材信息增加字段

dzx há 1 ano atrás
pai
commit
28dea0abce

+ 16 - 0
src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookDto.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 
@@ -132,4 +133,19 @@ public class AddTextbookDto implements Serializable {
      */
     @ApiModelProperty("使用类型(单位:学期)")
     private Integer useType;
+
+    @ApiModelProperty("是否校企合作开发教材")
+    private Integer isSecd;
+
+    @ApiModelProperty("出版日期")
+    private Date publishingDate;
+
+    @ApiModelProperty("分类号")
+    private String category;
+
+    @ApiModelProperty("规划批次")
+    private String planBatch;
+
+    @ApiModelProperty("编著作总数")
+    private Integer workTotalCount;
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/textbook/entity/Textbook.java

@@ -198,7 +198,7 @@ public class Textbook implements Serializable {
     @ApiModelProperty("是否校企合作开发教材")
     private Integer isSecd;
 
-    @ApiModelProperty("是否校企合作开发教材")
+    @ApiModelProperty("出版日期")
     private Date publishingDate;
 
     @ApiModelProperty("分类号")

+ 16 - 0
src/main/java/com/xjrsoft/module/textbook/vo/TextbookPageVo.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
 * @title: 教材管理分页列表出参
@@ -170,4 +171,19 @@ public class TextbookPageVo {
      */
     @ApiModelProperty("使用类型(单位:学期)")
     private Integer useType;
+
+    @ApiModelProperty("是否校企合作开发教材")
+    private Integer isSecd;
+
+    @ApiModelProperty("出版日期")
+    private Date publishingDate;
+
+    @ApiModelProperty("分类号")
+    private String category;
+
+    @ApiModelProperty("规划批次")
+    private String planBatch;
+
+    @ApiModelProperty("编著作总数")
+    private Integer workTotalCount;
 }

+ 16 - 0
src/main/java/com/xjrsoft/module/textbook/vo/TextbookVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -118,4 +119,19 @@ public class TextbookVo {
      */
     @ApiModelProperty("使用类型(单位:学期)")
     private Integer useType;
+
+    @ApiModelProperty("是否校企合作开发教材")
+    private Integer isSecd;
+
+    @ApiModelProperty("出版日期")
+    private Date publishingDate;
+
+    @ApiModelProperty("分类号")
+    private String category;
+
+    @ApiModelProperty("规划批次")
+    private String planBatch;
+
+    @ApiModelProperty("编著作总数")
+    private Integer workTotalCount;
 }

+ 1 - 1
src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -14,7 +14,7 @@
         LEFT JOIN base_class c2 ON c1.class_id = c2.id
         WHERE c1.textbook_id = t1.id) AS use_class,
         t6.name AS use_grade,t1.version,
-        t1.use_type
+        t1.use_type,t1.publishing_date,t1.is_secd,t1.category,t1.plan_batch,t1.work_total_count
         FROM textbook t1
         LEFT JOIN subject_group t2 ON t1.subject_group_id = t2.id
         LEFT JOIN base_semester t3 ON t1.base_semester_id = t3.id