Merge branch 'test' of licailing/wenlvju into master

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

@@ -0,0 +1,42 @@
+package com.izouma.wenlvju.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class TrainingInstitution extends BaseEntity {
+    @ApiModelProperty("企业名称")
+    private String name;
+
+    @ApiModelProperty("注册号")
+    private String uscc;
+
+    @ApiModelProperty("经营范围")
+    private String businessScope;
+
+    @ApiModelProperty("企业住所")
+    private String address;
+
+    @ApiModelProperty("生产经营场所")
+    private String businessPremise;
+
+    @ExcelProperty(value = "法人姓名")
+    @ApiModelProperty(value = "法人姓名")
+    private String privacyPolicy;
+
+    @ApiModelProperty(value = "企业联系方式")
+    private String phone;
+
+    @ApiModelProperty(value = "所属管区")
+    private String district;
+
+//    @ApiModelProperty(value = "注册资本（万）")
+//
+}

src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -102,15 +102,16 @@ public class ProgrammeController extends BaseController {
     }
 
     @PostMapping("/upload")
-    public void uploadFile(@RequestParam("file") MultipartFile file) {
-        try {
-            programmeService.upload(file, SecurityUtils.getAuthenticatedUser().getId());
-        } catch (IOException e) {
-            log.error("上传失败", e);
-            throw new BusinessException("上传失败", e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    public void uploadFile(@RequestParam("file") MultipartFile file) throws Exception {
+        programmeService.upload(file, SecurityUtils.getAuthenticatedUser().getId());
+//        try {
+//            programmeService.upload(file, SecurityUtils.getAuthenticatedUser().getId());
+//        } catch (IOException e) {
+//            log.error("上传失败", e);
+//            throw new BusinessException("上传失败", e.getMessage());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 
     @ApiOperation("移出分组")

src/main/resources/application.yaml

@@ -9,7 +9,7 @@ server:
         whitelabel:
             enabled: false
     tomcat:
-        max-http-form-post-size: 200MB
+        max-http-form-post-size: 400MB
 spring:
     profiles:
         active: dev
@@ -46,8 +46,8 @@ spring:
                 min_idle: 0
     servlet:
         multipart:
-            max_file_size: 200MB
-            max_request_size: 200MB
+            max_file_size: 400MB
+            max_request_size: 400MB
     freemarker:
         settings:
             number_format: 0

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -648,7 +648,7 @@ export default {
         showCode(row) {
             this.dialogCode = true;
             this.dialogUrl =
-                'http://wljtest.izouma.com/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
+                'http://yskj.njlyw.cn:8081/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
         },
         clearSearch() {
             this.form = {};
@@ -692,7 +692,8 @@ export default {
         upload() {},
         onfail(e) {
             console.log(e);
-            this.$message.error('失败');
+            this.$message.error('失败:' + e);
+            this.loading = false;
             this.getData();
         },
         onSuccess() {