Merge branch 'test' of licailing/wenlvju into master

src/main/h5/src/views/TrainingInstitution.vue

@@ -24,10 +24,10 @@
       </van-popover>
       <van-field
         name="注册号"
-        label="注册号"
-        placeholder="请输入注册号"
+        label="注册号/统一社会信用代码"
+        placeholder="请输入注册号/统一社会信用代码"
         v-model="form.uscc"
-        :rules="[{ required: true, message: '请填写注册号' }]"
+        :rules="[{ required: true, message: '请填写注册号/统一社会信用代码' }]"
       />
       <van-field
         name="是否从事文化艺术类校外培训"
@@ -146,8 +146,8 @@
         <van-field
           type="number"
           name="总面积"
-          label="总面积"
-          placeholder="请输入总面积"
+          label="总面积（建筑面积）"
+          placeholder="请输入总面积（建筑面积）"
           v-model="form.area"
         />
         <van-field
@@ -194,7 +194,7 @@
           <van-field
             type="digit"
             name="音乐类"
-            :label="`音乐类(教师总数:${form.teacherNum}人)`"
+            :label="音乐类"
             placeholder="请输入音乐类"
             v-model="form.musicNum"
             :rules="[{ required: true, message: '请填写音乐类' }]"
@@ -202,7 +202,7 @@
           <van-field
             type="digit"
             name="舞蹈类"
-            :label="`舞蹈类(教师总数:${form.teacherNum}人)`"
+            :label="舞蹈类"
             placeholder="请输入舞蹈类"
             v-model="form.danceNum"
             :rules="[{ required: true, message: '请填写舞蹈类' }]"
@@ -210,7 +210,7 @@
           <van-field
             type="digit"
             name="美术类"
-            :label="`美术类(教师总数:${form.teacherNum}人)`"
+            :label="美术类"
             placeholder="请输入美术类"
             v-model="form.artNum"
             :rules="[{ required: true, message: '请填写美术类' }]"
@@ -218,7 +218,7 @@
           <van-field
             type="digit"
             name="戏剧戏曲"
-            :label="`戏剧戏曲(教师总数:${form.teacherNum}人)`"
+            :label="戏剧戏曲"
             placeholder="请输入戏剧戏曲"
             v-model="form.theatreOperaNum"
             :rules="[{ required: true, message: '请填写戏剧戏曲' }]"
@@ -226,7 +226,7 @@
           <van-field
             type="digit"
             name="曲艺类"
-            :label="`曲艺类(教师总数:${form.teacherNum}人)`"
+            :label="曲艺类"
             placeholder="请输入曲艺类"
             v-model="form.folkMusicNum"
             :rules="[{ required: true, message: '请填写曲艺类' }]"
@@ -234,7 +234,7 @@
           <van-field
             type="digit"
             name="有教师资格证"
-            :label="`有教师资格证(教师总数:${form.teacherNum}人)`"
+            :label="有教师资格证"
             placeholder="请输入有教师资格证"
             v-model="form.qualificationNum"
             :rules="[{ required: true, message: '请填写有教师资格证' }]"

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

@@ -32,6 +32,7 @@ public class TrainingInstitution extends BaseEntity {
     private String uscc;
 
     @ApiModelProperty(value = "是否从事文化艺术类校外培训")
+    @ExcelProperty(value = "是否从事文化艺术类校外培训", converter = BooleanConverter.class)
     private boolean engagedInTraining;
 
     @ExcelProperty(value = "经营范围")
@@ -52,7 +53,7 @@ public class TrainingInstitution extends BaseEntity {
     private String privacyPolicy;
 
     @ExcelIgnore
-    @ApiModelProperty(value = "短信号码")
+    @ApiModelProperty(value = "短信发送号码")
     private String phone;
 
     @ExcelProperty(value = "企业联系方式")

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

@@ -23,6 +23,14 @@ public class TrainingInstitutionDTO {
     @ApiModelProperty("企业名称")
     private String name;
 
+    @ExcelProperty(value = "注册号")
+    @ApiModelProperty("注册号")
+    private String uscc;
+
+    @ExcelProperty(value = "法人姓名")
+    @ApiModelProperty(value = "法人姓名")
+    private String privacyPolicy;
+
     @ExcelProperty(value = "固定电话")
     @ApiModelProperty(value = "固定电话")
     private String contactPhone;

src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -377,15 +377,35 @@ public class RateService {
         urls.forEach(privacy -> {
             num.getAndIncrement();
             if ("doc".equals(getSuffix(privacy)) || "docx".equals(getSuffix(privacy))) {
-                InputStream is1 = HttpRequest.get(privacy)
-                        .stream();
+                InputStream is1;
+                if (privacy.contains("http")) {
+                    is1 = HttpRequest.get(privacy)
+                            .stream();
+                } else {
+                    try {
+                        is1 = new FileInputStream(privacy);
+                    } catch (FileNotFoundException e) {
+                        throw new BusinessException("找不到文件");
+                    }
+                }
                 InputStream stream = HttpRequest.post("http://convert.izouma.com/word2pdf")
                         .accept("*/*")
                         .part("file", "审核材料.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", is1)
                         .stream();
                 files.add(stream);
             } else if ("pdf".equals(getSuffix(privacy))) {
-                InputStream stream = HttpRequest.get(privacy).stream();
+                InputStream stream;
+                if (privacy.contains("http")) {
+                    stream = HttpRequest.get(privacy)
+                            .stream();
+                } else {
+                    try {
+                        stream = new FileInputStream(privacy);
+                    } catch (FileNotFoundException e) {
+                        throw new BusinessException("找不到文件");
+                    }
+                }
+//                InputStream stream = HttpRequest.get(privacy).stream();
                 files.add(stream);
             }
         });

src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java

@@ -37,7 +37,7 @@ public class TrainingInstitutionService {
     public void batchSend(List<String> phones) throws InterruptedException {
 
         int count = phones.size() / 950;
-        String body = "";
+        String body = "http://wljtest.izouma.com/h5/trainingInstitution";
         for (int i = 0; i < count; i++) {
             int start = i * 950;
             int end = start + 950;