Merge branch 'dev' of http://git.izouma.com/licailing/wenlvju into dev

src/main/java/com/izouma/wenlvju/repo/CollaborateRepo.java

@@ -14,4 +14,6 @@ public interface CollaborateRepo extends JpaRepository<Collaborate, Long>, JpaSp
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<Collaborate> findAllByRateId(Long rateId);
 }

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

@@ -1,11 +1,16 @@
 package com.izouma.wenlvju.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.izouma.wenlvju.config.DateConfig;
+import com.izouma.wenlvju.domain.Collaborate;
+import com.izouma.wenlvju.domain.GradingOrganization;
 import com.izouma.wenlvju.domain.Rate;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.RateAudit;
 import com.izouma.wenlvju.enums.RateStatus;
 import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.CollaborateRepo;
+import com.izouma.wenlvju.repo.GradingOrganizationRepo;
 import com.izouma.wenlvju.repo.RateRepo;
 import com.izouma.wenlvju.utils.JpaUtils;
 import freemarker.template.Configuration;
@@ -22,16 +27,16 @@ import java.nio.file.Paths;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
 public class RateService {
 
-    private final RateRepo rateRepo;
+    private final RateRepo                rateRepo;
+    private final CollaborateRepo         collaborateRepo;
+    private final GradingOrganizationRepo gradingOrganizationRepo;
 
     public Page<Rate> all(PageQuery pageQuery) {
         return rateRepo.findAll(JpaUtils.toSpecification(pageQuery, Rate.class), JpaUtils.toPageRequest(pageQuery));
@@ -85,6 +90,18 @@ public class RateService {
 //            if (rate.isUndertakeExamination()) {
 //            dataMap.put("examination", String.join(",", rate.getExamination()));
 //            }
+            Set<Long> ids = collaborateRepo.findAllByRateId(rate.getId())
+                    .stream()
+                    .map(Collaborate::getGradingOrganizationId)
+                    .collect(Collectors.toSet());
+            if (CollUtil.isNotEmpty(ids)) {
+                String str = gradingOrganizationRepo.findAllById(ids)
+                        .stream()
+                        .map(GradingOrganization::getName)
+                        .collect(Collectors.joining(","));
+                dataMap.put("examination", str);
+            }
+
             //单位概况
             dataMap.put("introduction", rate.getIntroduction());
             //Configuration 用于读取ftl文件

src/main/java/com/izouma/wenlvju/web/RateController.java

@@ -18,7 +18,6 @@ import com.izouma.wenlvju.service.RateService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;

src/main/vue/src/mixins/rateStatus.js

@@ -8,7 +8,7 @@ export default {
                 { label: '已上报', value: 'ASSIGN_EXPERT' },
                 { label: '待确定审查时间', value: 'REVIEW_TIME' },
                 { label: '待专家组考察', value: 'REVIEW_PENDING' },
-                { label: '最终评审', value: 'SUBMIT_GRADE' },
+                { label: '待最终评审', value: 'SUBMIT_GRADE' },
                 { label: '待提交纸质材料', value: 'SUBMIT_PAPER_MATERIALS' },
                 { label: '完成', value: 'COMPLETE' },
                 { label: '撤回', value: 'CANCEL' }

src/main/vue/src/views/RateList.vue

@@ -29,7 +29,7 @@
             <el-table-column prop="createdAt" label="申请时间" min-width="100"></el-table-column>
             <el-table-column prop="year" label="年度" min-width="60"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter" min-width="100"> </el-table-column>
-            <el-table-column label="考级机构"></el-table-column>
+            <!-- <el-table-column label="考级机构"></el-table-column> -->
             <el-table-column prop="score" label="分数">
                 <template slot-scope="{ row }">
                     <span v-if="row.score">{{ row.score }}</span>