licailing 4 vuotta sitten
vanhempi
commit
0611cbf0de

+ 64 - 0
src/main/java/com/izouma/wenlvju/domain/Complain.java

@@ -0,0 +1,64 @@
+package com.izouma.wenlvju.domain;
+
+import com.izouma.wenlvju.converter.StringArrayConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("投诉承办单位")
+public class Complain extends BaseEntity {
+    @ApiModelProperty(value = "记录人")
+    private Long userId;
+
+    @ApiModelProperty(value = "来源渠道")
+    private String source;
+
+    @ApiModelProperty(value = "来电时间")
+    private LocalDateTime complainAt;
+
+    private String sex;
+
+    private String phone;
+
+    @ApiModelProperty(value = "投诉目的")
+    private String title;
+
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty(value = "投诉内容")
+    private String content;
+
+    @ApiModelProperty(value = "问题性质")
+    private String nature;
+
+    @Convert(converter = StringArrayConverter.class)
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty(value = "图片")
+    private List<String> img;
+
+    @ApiModelProperty(value = "审查人")
+    private Long reviewUserId;
+
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty(value = "审查内容")
+    private String reviewContent;
+
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty(value = "审查图片")
+    private List<String> reviewImg;
+
+    @ApiModelProperty(value = "审查时间")
+    private LocalDateTime reviewAt;
+}

+ 1 - 1
src/main/java/com/izouma/wenlvju/domain/RateAudit.java

@@ -19,7 +19,7 @@ import javax.persistence.Enumerated;
 @NoArgsConstructor
 @Builder
 @Entity
-@ApiModel("操作记录")
+@ApiModel("等级评定操作记录")
 @Where(clause = "del = 0")
 public class RateAudit extends BaseEntity {
     private Long rateId;

+ 2 - 32
src/main/java/com/izouma/wenlvju/domain/RateExpertAudit.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.domain;
 
 import com.izouma.wenlvju.converter.StringArrayConverter;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,8 +20,8 @@ import java.util.List;
 @Builder
 @Entity
 @Where(clause = "del = false")
+@ApiModel("等级评定评分细则")
 public class RateExpertAudit extends BaseEntity {
-//    private Long userId;
 
     private Long rateId;
 
@@ -30,37 +31,6 @@ public class RateExpertAudit extends BaseEntity {
 
     private int score;
 
-//    @ApiModelProperty(value = "考级组织")
-//    private int examOrganization;
-//    @ApiModelProperty(value = "考点设置")
-//    private int examSite;
-//    @ApiModelProperty(value = "考场设置")
-//    private int examRoom;
-//    @ApiModelProperty(value = "环境要求")
-//    private int environment;
-//    @ApiModelProperty(value = "安全保障")
-//    private int safety;
-//    @ApiModelProperty(value = "宣传报备")
-//    private int promote;
-//    @ApiModelProperty(value = "考级报名")
-//    private int signUp;
-//    @ApiModelProperty(value = "考试准备")
-//    private int examPreparation;
-//    @ApiModelProperty(value = "考场服务")
-//    private int examService;
-//    @ApiModelProperty(value = "考务考官")
-//    private int examiner;
-//    @ApiModelProperty(value = "考级规范")
-//    private int specification;
-//    @ApiModelProperty(value = "视频器材")
-//    private int video;
-//    @ApiModelProperty(value = "考试成绩")
-//    private int score;
-//    @ApiModelProperty(value = "艺术培训")
-//    private int artTrain;
-//    @ApiModelProperty(value = "艺术成果")
-//    private int artResult;
-
     @Column(columnDefinition = "TEXT")
     @Convert(converter = StringArrayConverter.class)
     private List<String> img;

+ 0 - 4
src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -45,10 +45,6 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "统一社会信用代码")
     private String uscc;
 
-//    @ApiModelProperty(value = "考级地点")
-//    @Convert(converter = LongArrayConverter.class)
-//    private Long examinationDistrict;
-
     @ApiModelProperty(value = "考级详细地址")
     private String examinationAddress;
 

+ 4 - 3
src/main/java/com/izouma/wenlvju/domain/RecordExamRoom.java

@@ -1,10 +1,12 @@
 package com.izouma.wenlvju.domain;
 
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 
@@ -13,12 +15,11 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 @Builder
 @Entity
+@ApiModel("备案考场")
+@Where(clause = "del = 0")
 public class RecordExamRoom extends BaseEntity {
     private Long recordId;
 
     private Long examRoomId;
 
-//    @Column(columnDefinition = "TEXT")
-//    @Convert(converter = LongArrayConverter.class)
-//    private List<Long> artTypeId;
 }

+ 0 - 29
src/main/java/com/izouma/wenlvju/domain/ReviewOrganization.java

@@ -1,29 +0,0 @@
-package com.izouma.wenlvju.domain;
-
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@ApiModel("审查承办单位")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ReviewOrganization extends BaseEntity {
-    private Long userId;
-
-//    private Long organizationId;
-    private Long rateId;
-
-//    @ApiModelProperty(value = "审核时间")
-//    private LocalDateTime reviewTime;
-
-    private String content;
-
-    private List<String> img;
-
-}