Merge branch 'dev' of licailing/wenlvju into master

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

@@ -150,6 +150,8 @@ public class Rate extends BaseEntity {
 
     private boolean isRejected;
 
+    private int sort;
+
     @ApiModelProperty(value = "驳回时间")
     private LocalDateTime rejectedAt;
 

src/main/java/com/izouma/wenlvju/enums/RateStatus.java

@@ -4,63 +4,70 @@ public enum RateStatus {
     /*
     草稿
      */
-    DRAFT("草稿"),
+    DRAFT("草稿", 1),
     /*
     等待初审
      */
-    FIRST_REVIEW_PENDING("等待初审"),
+    FIRST_REVIEW_PENDING("等待初审", 2),
     /*
     受理
      */
-    ACCEPT("正在受理"),
+    ACCEPT("正在受理", 3),
     /*
     审核完成
      */
-    FIRST_REVIEW_COMPLETED("审核完成"),
+    FIRST_REVIEW_COMPLETED("审核完成", 4),
     /*
     初审不通过
      */
-    FIRST_REVIEW_DENY("初审驳回"),
+    FIRST_REVIEW_DENY("初审驳回", 5),
     /*
     待分配专家组
      */
-    ASSIGN_EXPERT("区县已上报"),
+    ASSIGN_EXPERT("区县已上报", 6),
     /*
     市里退回
      */
-    REVIEW_DENY("复审驳回"),
+    REVIEW_DENY("复审驳回", 7),
     /*
     待专家组考察（已分配专家组）
      */
-    REVIEW_PENDING("待线下考察"),
+    REVIEW_PENDING("待线下考察", 8),
     /*
     最终评审
      */
-    SUBMIT_GRADE("待最终评审"),
+    SUBMIT_GRADE("待最终评审", 9),
     /*
     待提交纸质材料
      */
-    SUBMIT_PAPER_MATERIALS("待承办单位提交材料"),
+    SUBMIT_PAPER_MATERIALS("待承办单位提交材料", 10),
     /*
     待收取纸质材料
      */
-    COLLECT_PAPER_MATERIALS("待区县提交材料"),
+    COLLECT_PAPER_MATERIALS("待区县提交材料", 11),
     /*
     取消
      */
-    CANCEL("取消"),
+    CANCEL("取消", 0),
     /*
     完成
      */
-    COMPLETE("完成");
+    COMPLETE("完成", 12);
 
     private final String desc;
 
+    private final int sort;
+
     public String getDesc() {
         return desc;
     }
 
-    RateStatus(String desc) {
+    public int getSort() {
+        return sort;
+    }
+
+    RateStatus(String desc, int sort) {
         this.desc = desc;
+        this.sort = sort;
     }
 }

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

@@ -94,6 +94,7 @@ public class RateService {
                 default:
                     break;
             }
+            orig.setSort(orig.getStatus().getSort());
             return rateRepo.save(orig);
 
         }
@@ -109,7 +110,7 @@ public class RateService {
             Map<String, String> map = this.applyMessage(district, now);
             njwlSmsService.sendSms(map.get("phone"), map.get("message"));
         }
-
+        record.setSort(record.getStatus().getSort());
         return rateRepo.save(record);
     }
 
@@ -119,6 +120,7 @@ public class RateService {
     public void offline(Long id) {
         Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         rate.setStatus(RateStatus.REVIEW_PENDING);
+        rate.setSort(rate.getStatus().getSort());
         rateRepo.save(rate);
     }
 
@@ -138,6 +140,7 @@ public class RateService {
                 .status(status)
                 .build();
         rateAuditRepo.save(rateAudit);
+        rate.setSort(rate.getStatus().getSort());
         rateRepo.save(rate);
         switch (status) {
             case FIRST_REVIEW_DENY:
@@ -192,6 +195,7 @@ public class RateService {
                 .status(RateStatus.REVIEW_PENDING)
                 .build();
         rateAuditRepo.save(rateAudit);
+        rate.setSort(RateStatus.REVIEW_PENDING.getSort());
         rate = rateRepo.save(rate);
 
         // 发送短信 确定审查时间
@@ -210,6 +214,7 @@ public class RateService {
     public void paperMaterial(Long id, RateStatus status, String remark, Long userId) {
         Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         rate.setStatus(status);
+        rate.setSort(status.getSort());
         rateRepo.save(rate);
         RateAudit rateAudit = RateAudit.builder()
                 .userId(userId)

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

@@ -407,7 +407,7 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'createdAt,desc',
+                sort: 'sort,desc;createdAt,desc',
                 query: {
                     submit: true,
                     status: []

src/main/vue/src/views/rate/RateListDone.vue

@@ -345,7 +345,7 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'createdAt,desc',
+                sort: 'sort,desc;createdAt,desc',
                 query: {
                     submit: true,
                     status: ['REVIEW_PENDING', 'SUBMIT_PAPER_MATERIALS', 'COMPLETE']

src/main/vue/src/views/rate/RateListPending.vue

@@ -345,7 +345,7 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'createdAt,desc',
+                sort: 'sort,desc;createdAt,desc',
                 query: {
                     submit: true,
                     status: ['ASSIGN_EXPERT', 'SUBMIT_GRADE', 'COLLECT_PAPER_MATERIALS']

src/test/java/com/izouma/wenlvju/repo/RepoTest.java

@@ -147,4 +147,13 @@ public class RepoTest extends ApplicationTests {
         });
 
     }
+
+    @Test
+    public void test2() {
+        List<Rate> all = rateRepo.findAll();
+        all.forEach(rate -> {
+            rate.setSort(rate.getStatus().getSort());
+            rateRepo.save(rate);
+        });
+    }
 }

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(469L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(11036L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }