评分退回/显示所有登记评定

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

@@ -37,6 +37,7 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "考级机构名称")
     private String examinationAgency;
 
+    @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "单位类别")
     private WorkCategory category;
 

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

@@ -130,26 +130,41 @@ public class RateService {
                 .build();
         rateAuditRepo.save(rateAudit);
         rateRepo.save(rate);
-        if (RateStatus.FIRST_REVIEW_DENY.equals(status)) {// 初审不通过
-            // 发送短信给承办单位
-            njwlSmsService.sendSms(rate.getOwnerPhone(), "你单位等级评定申请被" + rate.getDistrict() + "文化和旅游局退回，请根据反馈意见及时处理！");
-        } else if (RateStatus.ASSIGN_EXPERT.equals(status)) { // 初审通过 2
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_TIME_FORMAT);
-            String phone1 = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_ADMIN))
-                    .stream()
-                    .map(User::getPhone)
-                    .collect(Collectors.joining(","));
-            String message1 = "您于" + dtf.format(LocalDateTime.now()) + "，收到" + rate.getDistrict() + "文化和旅游局上报的承办单位等级评定申请。";
-            njwlSmsService.sendSms(phone1, message1);
-        } else if (RateStatus.REVIEW_DENY.equals(status)) {
-            String phone = userRepo.findAllByDistrictAndAuthoritiesContainsAndDelFalse(rate.getDistrict(), Authority.get(AuthorityName.ROLE_DISTRICT_STAFF))
-                    .stream()
-                    .map(User::getPhone)
-                    .collect(Collectors.joining(","));
-            String message = "你区上报的承办单位等级评定申请被市文化和旅游局等级评定委员会退回，请根据反馈意见及时处理！";
-            njwlSmsService.sendSms(phone, message);
+        switch (status) {
+            case FIRST_REVIEW_DENY:
+                // 发送短信给承办单位
+                njwlSmsService.sendSms(rate.getOwnerPhone(), "你单位等级评定申请被" + rate.getDistrict() + "文化和旅游局退回，请根据反馈意见及时处理！");
+                break;
+            case ASSIGN_EXPERT:
+                DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_TIME_FORMAT);
+                String phone1 = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_ADMIN))
+                        .stream()
+                        .map(User::getPhone)
+                        .collect(Collectors.joining(","));
+                String message1 = "您于" + dtf.format(LocalDateTime.now()) + "，收到" + rate.getDistrict() + "文化和旅游局上报的承办单位等级评定申请。";
+                njwlSmsService.sendSms(phone1, message1);
+                break;
+            case REVIEW_DENY:
+                String phone = userRepo.findAllByDistrictAndAuthoritiesContainsAndDelFalse(rate.getDistrict(), Authority
+                        .get(AuthorityName.ROLE_DISTRICT_STAFF))
+                        .stream()
+                        .map(User::getPhone)
+                        .collect(Collectors.joining(","));
+                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;
         }
-
     }
 
     public Rate saveReviewTime(Long id, LocalDateTime time, Long userId) {
@@ -245,11 +260,6 @@ public class RateService {
         }
     }
 
-//    public String Image2Base64(String imgUrl) {
-//        BASE64Encoder encoder = new BASE64Encoder();
-//        return encoder.encode(HttpRequest.get(imgUrl).bytes()).replace("\n", "\r\n").replace("\r\r\n", "\r\n");
-//    }
-
     public void imgToPdf(List<InputStream> files, Rate rate) {
         List<String> imageUrllist = new ArrayList<>();
 
@@ -453,7 +463,6 @@ public class RateService {
     }
 
     public Map<String, String> reviewTimesMessage(Rate rate) {
-//        Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         List<Long> ids = new ArrayList<>(rate.getExpertMemberUserId());
         ids.add(rate.getExpertUserId());
         Map<Long, User> userMap = userRepo.findAllById(ids)

src/main/vue/src/views/rate/GradeList.vue

@@ -7,7 +7,7 @@
             header-cell-class-name="table-header-cell"
             row-class-name="table-row"
             cell-class-name="table-cell"
-            :height="tableHeight1"
+            height="tableHeight1"
             :span-method="objectSpanMethod"
             :summary-method="summaryMethod"
             show-summary
@@ -63,7 +63,10 @@
         <div style="padding:20px 50px;display:flex" class="fixed-btn">
             <el-button @click="$router.go(-1)">返回</el-button>
             <div style="flex-grow:1"></div>
-            <el-button type="primary" v-if="submitList.length !== 0" @click="saveExpertScore">
+            <el-button type="danger" v-if="submitList.length !== 0" @click="saveDismiss" :loading="loading">
+                退回
+            </el-button>
+            <el-button type="primary" v-if="submitList.length !== 0" @click="saveExpertScore" :loading="loading">
                 最终评分
             </el-button>
         </div>
@@ -80,9 +83,10 @@ export default {
         return {
             multipleMode: false,
             search: '',
+            loading: false,
             downloading: false,
             spanArr: [],
-            tableHeight1: 620,
+            tableHeight1: 730,
             rateList: [],
             info: {},
             form: {}
@@ -118,6 +122,7 @@ export default {
     },
     methods: {
         saveExpertScore() {
+            this.loading = true;
             this.$http
                 .post('/rateExpertAudit/batchSave', {
                     audits: JSON.stringify(this.submitList)
@@ -129,6 +134,7 @@ export default {
                 })
                 .then(res => {
                     this.$message.success('评审完成');
+                    this.loading = false;
                     this.getGride();
                 });
         },
@@ -352,6 +358,25 @@ export default {
                     this.getGride();
                 })
                 .catch(() => {});
+        },
+        saveDismiss() {
+            this.loading = true;
+            this.$http
+                .post('/rate/audit', {
+                    id: this.$route.query.id,
+                    status: 'REVIEW_PENDING',
+                    remark: '评分被退回，待专家补全资料'
+                })
+                .then(res => {
+                    this.loading = false;
+                    this.$message.success('退回成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    this.loading = false;
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
         }
     }
 };

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

@@ -134,7 +134,7 @@
                         @change="getData"
                     >
                         <el-option
-                            v-for="item in statusOptions2"
+                            v-for="item in statusOptions"
                             :key="item.value"
                             :value="item.value"
                             :label="item.label"
@@ -410,14 +410,7 @@ export default {
                 sort: 'createdAt,desc',
                 query: {
                     submit: true,
-                    status: [
-                        'ASSIGN_EXPERT',
-                        'REVIEW_PENDING',
-                        'SUBMIT_GRADE',
-                        'SUBMIT_PAPER_MATERIALS',
-                        'COLLECT_PAPER_MATERIALS',
-                        'COMPLETE'
-                    ]
+                    status: []
                 }
             };
 
@@ -478,14 +471,7 @@ export default {
             if (this.status.length > 0) {
                 params.query.status = this.status;
             } else {
-                params.query.status = [
-                    'ASSIGN_EXPERT',
-                    'REVIEW_PENDING',
-                    'SUBMIT_GRADE',
-                    'SUBMIT_PAPER_MATERIALS',
-                    'COLLECT_PAPER_MATERIALS',
-                    'COMPLETE'
-                ];
+                params.query.status = [];
             }
 
             this.$axios

src/main/vue/src/views/rate/RateListRejected.vue

@@ -54,7 +54,7 @@
                         @change="getData"
                     >
                         <el-option
-                            v-for="item in statusOptions2"
+                            v-for="item in statusOptions1"
                             :key="item.value"
                             :value="item.value"
                             :label="item.label"