监管

src/main/java/com/izouma/wenlvju/converter/PerformanceEnquiryListConverter.java

@@ -0,0 +1,25 @@
+package com.izouma.wenlvju.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.izouma.wenlvju.dto.PerformanceEnquiry;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import java.util.List;
+
+public class PerformanceEnquiryListConverter implements AttributeConverter<List<PerformanceEnquiry>, String> {
+    @Override
+    public String convertToDatabaseColumn(List<PerformanceEnquiry> list) {
+        if (list != null)
+            return JSON.toJSONString(list);
+        return null;
+    }
+
+    @Override
+    public List<PerformanceEnquiry> convertToEntityAttribute(String s) {
+        if (StringUtils.isNotEmpty(s)) {
+            return JSON.parseArray(s, PerformanceEnquiry.class);
+        }
+        return null;
+    }
+}

src/main/java/com/izouma/wenlvju/domain/Performance.java

@@ -1,5 +1,7 @@
 package com.izouma.wenlvju.domain;
 
+import com.izouma.wenlvju.converter.PerformanceEnquiryListConverter;
+import com.izouma.wenlvju.dto.PerformanceEnquiry;
 import com.izouma.wenlvju.enums.PerformanceStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,11 +10,10 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -24,32 +25,35 @@ public class Performance extends BaseEntity {
     @ApiModelProperty(value = "名称")
     private String name;
 
-    @ApiModelProperty(value = "报名时间")
-    private LocalDate startDate;
+//    @ApiModelProperty(value = "报名时间")
+//    private LocalDate startDate;
 
-    @ApiModelProperty(value = "报名时间")
+    @ApiModelProperty(value = "报名截止时间")
     private LocalDate endDate;
 
     @ApiModelProperty(value = "活动时间")
     private LocalDate eventStartDate;
 
-    @ApiModelProperty(value = "上午开始时间")
-    private LocalTime morningStartTime;
 
-    private LocalTime morningEndTime;
+    @ApiModelProperty(value = "地点")
+    private String address;
 
-    @ApiModelProperty(value = "节目时长（分钟）")
-    private Long programmeLength;
+    @ApiModelProperty(value = "状态")
+    @Enumerated(EnumType.STRING)
+    private PerformanceStatus status;
 
-    private LocalTime afternoonStartTime;
 
-//    @ApiModelProperty(value = "活动时间")
-//    private LocalDate eventEndDate;
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = PerformanceEnquiryListConverter.class)
+    @ApiModelProperty(value = "咨询电话")
+    private List<PerformanceEnquiry> performanceEnquiries;
 
-    @ApiModelProperty(value = "地点")
-    private String address;
 
-//    @ApiModelProperty(value = "状态")
-//    @Enumerated(EnumType.STRING)
-//    private PerformanceStatus status;
+    private String email;
+
+    /**
+     *附件
+     */
+    @ApiModelProperty(value = "活动方案")
+    private String programme;
 }

src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -77,15 +77,6 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "考试简章")
     private String examinationGuide;
 
-    /**
-     *考后备案
-     */
-    @ApiModelProperty(value = "考试人数")
-    private int numOfCandidates;
-
-    @ApiModelProperty(value = "合格人数")
-    private int numOfQualified;
-
 //    @ApiModelProperty(value = "监管人员")
 //    private Long supervisorUserId;
 

src/main/java/com/izouma/wenlvju/domain/RecordSpecialty.java

@@ -30,21 +30,10 @@ public class RecordSpecialty extends BaseEntity {
     @ApiModelProperty(value = "总级数")
     private int level;
 
-//    private String status;
-
     @ApiModelProperty(value = "考场数量")
     private int numOfExam;
 
     @ApiModelProperty(value = "考官人数")
     private int examinerQuantity;
 
-    /*
-    考后备案
-    */
-    @ApiModelProperty(value = "考试人数")
-    private int numOfCandidates;
-
-    @ApiModelProperty(value = "合格人数")
-    private int numOfQualified;
-
 }

src/main/java/com/izouma/wenlvju/domain/Complain.java → src/main/java/com/izouma/wenlvju/domain/regulation/Complain.java

@@ -1,6 +1,7 @@
-package com.izouma.wenlvju.domain;
+package com.izouma.wenlvju.domain.regulation;
 
 import com.izouma.wenlvju.converter.StringArrayConverter;
+import com.izouma.wenlvju.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,7 +19,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("投诉承办单位")
+@ApiModel(value = "咨询投诉")
 public class Complain extends BaseEntity {
     @ApiModelProperty(value = "记录人")
     private Long userId;
@@ -29,8 +30,10 @@ public class Complain extends BaseEntity {
     @ApiModelProperty(value = "来电时间")
     private LocalDateTime complainAt;
 
+    @ApiModelProperty(value = "性别")
     private String sex;
 
+    @ApiModelProperty(value = "联系方式")
     private String phone;
 
     @ApiModelProperty(value = "投诉目的")
@@ -43,17 +46,30 @@ public class Complain extends BaseEntity {
     @ApiModelProperty(value = "问题性质")
     private String nature;
 
-    @Convert(converter = StringArrayConverter.class)
-    @Column(columnDefinition = "TEXT")
-    @ApiModelProperty(value = "图片")
-    private List<String> img;
+    /**
+     * 考级机构
+     * 承办单位
+     */
+    @ApiModelProperty(value = "单位类型")
+    private String unitType;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+//    @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;
+    @ApiModelProperty(value = "办理情况")
+    private String processing;
+
+    @ApiModelProperty(value = "情况属实")
+    private Boolean real;
 
     @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "审查图片")

src/main/java/com/izouma/wenlvju/domain/regulation/EquipmentLog.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.domain.regulation;
+
+import com.izouma.wenlvju.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "监控日志")
+public class EquipmentLog extends BaseEntity {
+    private String roomId;
+
+    private String status;
+
+    private String organizationId;
+
+}

src/main/java/com/izouma/wenlvju/dto/PerformanceEnquiry.java

@@ -0,0 +1,9 @@
+package com.izouma.wenlvju.dto;
+
+import lombok.Data;
+
+@Data
+public class PerformanceEnquiry {
+    private String name;
+    private String phone;
+}