Merge branch 'test' of licailing/wenlvju into master

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

@@ -7,6 +7,9 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+import java.math.BigDecimal;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -18,6 +21,7 @@ public class TrainingInstitution extends BaseEntity {
     @ApiModelProperty("注册号")
     private String uscc;
 
+    @Column(columnDefinition = "TEXT")
     @ApiModelProperty("经营范围")
     private String businessScope;
 
@@ -34,9 +38,46 @@ public class TrainingInstitution extends BaseEntity {
     @ApiModelProperty(value = "企业联系方式")
     private String phone;
 
+    @ApiModelProperty(value = "企业联系方式")
+    private String contactPhone;
+
     @ApiModelProperty(value = "所属管区")
     private String district;
 
-//    @ApiModelProperty(value = "注册资本（万）")
-//
+    @ApiModelProperty(value = "注册资本（万）")
+    private BigDecimal registeredCapital;
+
+    @ApiModelProperty(value = "单位性质")
+    private String category;
+
+    @ApiModelProperty(value = "专业种类")
+    private String specialty;
+
+    @ApiModelProperty(value = "培训点数量三楼及以下")
+    private int trainingSite;
+
+    @ApiModelProperty(value = "培训点数量死楼及以上")
+    private int trainingSiteFour;
+
+    @ApiModelProperty(value = "总面积")
+    private double area;
+
+    @ApiModelProperty(value = "教室数量")
+    private int numberOfClassroom;
+
+    @ApiModelProperty(value = "教师数量")
+    private int numberOfTeacher;
+
+    @ApiModelProperty(value = "专职数量")
+
+    private long traningNum;
+
+    private boolean examPoint;
+
+    private String gradingOrganization;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
 }

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -358,6 +358,7 @@ public class ProgrammeService {
             }
 
             participant.setProgrammeId(pid);
+            participant.setPerformanceId(performance);
             participants.add(participant);
             File uploadImg;
             if (dto.getImg() != null) {