Merge branch 'dev' of licailing/wenlvju into master

src/main/h5/src/plugins/http.js

@@ -4,8 +4,8 @@ import qs from "qs";
 let baseUrl = "http://localhost:8080";
 switch (process.env.NODE_ENV) {
   case "development":
-    baseUrl = "http://wlj.izouma.com";
-    // baseUrl = 'http://localhost:8080';
+    // baseUrl = "http://wlj.izouma.com";
+    baseUrl = 'http://localhost:8080';
     break;
   case "test":
     baseUrl = "http://localhost:8080";

src/main/h5/src/views/expert/expertDetail.vue

@@ -6,7 +6,10 @@
         <div class="info">
           <div class="title">{{ organization.name }}</div>
           <div class="address">
-            <div class="text">
+            <div class="text" v-if="rateInfo.change">
+              南京市{{ organization.district }} {{ rateInfo.changeAddress }}
+            </div>
+            <div class="text" v-else>
               南京市{{ organization.district }} {{ organization.address }}
             </div>
             <!-- <div class="img">
@@ -126,7 +129,8 @@ export default {
       rateInfo: {},
       organization: {},
       rateList: [],
-      userList: []
+      userList: [],
+      address: ""
     };
   },
   mounted() {

src/main/h5/src/views/expert/expertList.vue

@@ -95,8 +95,14 @@ export default {
         {
           size: 20,
           query: {
-            expertUserId: this.$store.state.userInfo.id
-            // status: ["SUBMIT_GRADE", "REVIEW_PENDING"],
+            expertUserId: this.$store.state.userInfo.id,
+            status: [
+              "SUBMIT_GRADE",
+              "REVIEW_PENDING",
+              "SUBMIT_PAPER_MATERIALS",
+              "COLLECT_PAPER_MATERIALS",
+              "COMPLETE"
+            ]
           }
         },
         { body: "json" }

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

@@ -155,9 +155,18 @@ public class Rate extends BaseEntity {
     @ApiModelProperty(value = "驳回时间")
     private LocalDateTime rejectedAt;
 
+    @ApiModelProperty(value = "是否变更地址")
+    private boolean isChange;
+
+    @ApiModelProperty(value = "变更地址")
+    private String changeAddress;
+
     public String getDetailAddress() {
-        String str = "江苏省南京市";
-        if (StrUtil.isNotBlank(this.address)) {
+        String str = "江苏省南京市" + this.district;
+
+        if (this.isChange && StrUtil.isNotBlank(this.changeAddress)) {
+            str += this.changeAddress;
+        } else if (StrUtil.isNotBlank(this.address)) {
             str += this.address;
         }
         return str;

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

@@ -53,6 +53,7 @@ public class RateService {
     private final RateAuditRepo           rateAuditRepo;
     private final UserRepo                userRepo;
     private final NjwlSmsService          njwlSmsService;
+    private final OrganizationRepo        organizationRepo;
 
     public Page<Rate> all(PageQuery pageQuery) {
         return rateRepo.findAll(JpaUtils.toSpecification(pageQuery, Rate.class), JpaUtils.toPageRequest(pageQuery));
@@ -176,15 +177,6 @@ public class RateService {
                 String message = "你区上报的承办单位等级评定申请被市文化和旅游局等级评定委员会退回，请根据反馈意见及时处理！";
                 njwlSmsService.sendSms(phone, message);
                 break;
-//            case REVIEW_PENDING:
-//                List<Long> ids = new ArrayList<>(rate.getExpertMemberUserId());
-//                ids.add(rate.getExpertUserId());
-//                String expertPhone = userRepo.findAllById(ids)
-//                        .stream()
-//                        .map(User::getPhone)
-//                        .collect(Collectors.joining(","));
-//                njwlSmsService.sendSms(expertPhone,"评分已被退回！");
-//                break;
             default:
                 break;
         }
@@ -345,13 +337,6 @@ public class RateService {
      * @return 压缩百分比
      */
     public int getPercent(float weight) {
-//        float percent;
-//        if (height > weight) {
-//            percent = PageSize.A4.getHeight() / height * 100;
-//        } else {
-//            percent = PageSize.A4.getWidth() / weight * 100;
-//        }
-//        return Math.round(percent);
         int p;
         float p2;
         p2 = 530 / weight * 100;
@@ -417,12 +402,6 @@ public class RateService {
                 .receive(file);
         files.add(file);
         this.downloadFile(files, rate.getPrivacyPolicy(), "法人资格");
-//        this.downloadFile(files, rate.getBusiness(), "业务内容");
-//        this.downloadFile(files, rate.getCredits(), "社会信誉");
-//        this.downloadFile(files, rate.getFire(), "消防安全");
-//        this.downloadFile(files, rate.getHygiene(), "卫生防疫");
-//        this.downloadFile(files, rate.getFinance(), "财务报表");
-//        this.downloadFile(files, rate.getProperty(), "房产证明");
         return files;
     }
 
@@ -475,7 +454,6 @@ public class RateService {
         for (InputStream is : files) {
             is.close();
         }
-//        return outputStream.toString();
 
         response.setContentType("application/pdf");
         response.setHeader("Content-Disposition", "attachment; filename=" + "result.pdf");
@@ -493,6 +471,10 @@ public class RateService {
         Map<Long, User> userMap = userRepo.findAllById(ids)
                 .stream()
                 .collect(Collectors.toMap(User::getId, user -> user));
+        if (!rate.isChange()) {
+            Organization organization = organizationRepo.findById(rate.getId()).orElseThrow(new BusinessException("无记录"));
+            rate.setAddress(organization.getAddress());
+        }
 
         String message = "现场检查计划已分配：\n" +
                 "审核单位：%s\n" +

src/main/vue/src/views/rate/AssignExpert.vue

@@ -17,7 +17,7 @@
                 <el-input
                     readonly
                     type="textarea"
-                    :autosize="{ minRows: 3, maxRows: 4 }"
+                    :autosize="{ minRows: 3, maxRows: 6 }"
                     placeholder="请输入单位概况"
                     v-model="formData.introduction"
                 ></el-input>
@@ -121,8 +121,15 @@
                 </div>
             </el-form-item>
             <el-form-item label="变更地址">
-                <el-switch v-model="formData.change"></el-switch>
-                <el-input type="textarea" :rows="3" v-if="formData.change" placeholder="请输入新地址"></el-input>
+                <el-switch v-model="formData.change" :disabled="formData.status !== 'ASSIGN_EXPERT'"></el-switch>
+                <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-if="formData.change"
+                    placeholder="请输入新地址"
+                    v-model="formData.changeAddress"
+                    :readonly="formData.status != 'ASSIGN_EXPERT'"
+                ></el-input>
             </el-form-item>
             <el-form-item class="fixed-btn">
                 <el-button @click="onSave" :loading="saving" type="primary" v-if="formData.status == 'ASSIGN_EXPERT'"

src/test/java/com/izouma/wenlvju/service/RateServiceTest.java

@@ -161,12 +161,8 @@ public class RateServiceTest extends ApplicationTests {
 
     @Test
     public void test9() {
-//        //加载Excel文档
-//        Workbook wb = new Workbook();
-//        wb.loadFromFile("C:\\Users\\Test1\\Desktop\\Test.xlsx");
-//
-//        //调用方法保存为PDF格式
-//        wb.saveToFile("output/ToPDF.pdf", FileFormat.PDF);
+        Rate rate = rateRepo.findById(366L).orElseThrow(new BusinessException("无消息"));
+        System.out.println(rateService.reviewTimesMessage(rate));
     }