增加report模块

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBSchoolCourse.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.base.BaseEntity;
+import com.qmth.teachcloud.report.enums.PublishStatusEnum;
+import com.qmth.teachcloud.report.enums.TestStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -36,11 +38,12 @@ public class TBSchoolCourse extends BaseEntity implements Serializable {
     private String courseName;
 
     @ApiModelProperty(value = "测试状态（UN_TEST：未测试、TEST：已测试、CHECKED：已抽检）")
-    @TableField(value = "course_node")
-    private String testStatus;
+    @TableField(value = "test_status")
+    private TestStatusEnum testStatus;
 
     @ApiModelProperty(value = "发布状态（UN_COMPUTE：未计算、UN_PUBLISH：未发布、PUBLISH：已发布）")
-    private String publishStatus;
+    @TableField(value = "publish_status")
+    private PublishStatusEnum publishStatus;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -70,19 +73,19 @@ public class TBSchoolCourse extends BaseEntity implements Serializable {
         this.courseName = courseName;
     }
 
-    public String getTestStatus() {
+    public TestStatusEnum getTestStatus() {
         return testStatus;
     }
 
-    public void setTestStatus(String testStatus) {
+    public void setTestStatus(TestStatusEnum testStatus) {
         this.testStatus = testStatus;
     }
 
-    public String getPublishStatus() {
+    public PublishStatusEnum getPublishStatus() {
         return publishStatus;
     }
 
-    public void setPublishStatus(String publishStatus) {
+    public void setPublishStatus(PublishStatusEnum publishStatus) {
         this.publishStatus = publishStatus;
     }
 }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBStudent.java

@@ -4,6 +4,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.report.enums.GenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -40,9 +41,9 @@ public class TBStudent implements Serializable {
     @TableField(value = "student_code")
     private String studentCode;
 
-    @ApiModelProperty(value = "性别")
-    @TableField(value = "sex")
-    private String sex;
+    @ApiModelProperty(value = "性别，MAN：男，WOMAN：女")
+    @TableField(value = "gender")
+    private GenderEnum gender;
 
     @ApiModelProperty(value = "照片地址")
     @TableField(value = "person_img_url")
@@ -84,12 +85,12 @@ public class TBStudent implements Serializable {
         this.studentCode = studentCode;
     }
 
-    public String getSex() {
-        return sex;
+    public GenderEnum getGender() {
+        return gender;
     }
 
-    public void setSex(String sex) {
-        this.sex = sex;
+    public void setGender(GenderEnum gender) {
+        this.gender = gender;
     }
 
     public String getPersonImgUrl() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/enums/GenderEnum.java

@@ -0,0 +1,25 @@
+package com.qmth.teachcloud.report.enums;
+
+/**
+ * @Description: 性别 enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/7/29
+ */
+public enum GenderEnum {
+
+    MAN("男"),
+
+    WOMAN("女");
+
+    private GenderEnum(String code) {
+        this.code = code;
+    }
+
+    private String code;
+
+    public String getCode() {
+        return code;
+    }
+}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/enums/PublishStatusEnum.java

@@ -0,0 +1,44 @@
+package com.qmth.teachcloud.report.enums;
+
+import java.util.Objects;
+
+/**
+ * @Description: 发布状态enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/3/29
+ */
+public enum PublishStatusEnum {
+
+    UN_COMPUTE("未计算"),
+
+    UN_PUBLISH("未发布"),
+
+    PUBLISH("已发布");
+
+    private String title;
+
+    private PublishStatusEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param title
+     * @return
+     */
+    public static String convertToName(String title) {
+        for (PublishStatusEnum e : PublishStatusEnum.values()) {
+            if (Objects.equals(title, e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/enums/TestStatusEnum.java

@@ -0,0 +1,44 @@
+package com.qmth.teachcloud.report.enums;
+
+import java.util.Objects;
+
+/**
+ * @Description: 测试状态enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/3/29
+ */
+public enum TestStatusEnum {
+
+    UN_TEST("未测试"),
+
+    TEST("已测试"),
+
+    CHECKED("已抽检");
+
+    private String title;
+
+    private TestStatusEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param title
+     * @return
+     */
+    public static String convertToName(String title) {
+        for (TestStatusEnum e : TestStatusEnum.values()) {
+            if (Objects.equals(title, e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+}