[fix] 修改合同同步和合同文件同步任务的执行时间

[add] 合同进度注释完善

src/main/java/vion/cron/ContractRunner.java

@@ -293,7 +293,7 @@ public class ContractRunner {
         log.info("【结束】从crm系统同步合同信息");
         log.info("【结束】从crm系统同步合同信息");
     }*/
     }*/
 
 
-    @Scheduled(cron = "0 0 * * * *")
+    @Scheduled(cron = "0 0 8-20 * * *")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void contractSync1() {
     public void contractSync1() {
         Long modifyTime = Opt.ofNullable((Long) redissonClient.getBucket(RedisKeyEnum.CONTRACT_SYNC_NEW_TIME.getVal()).get()).orElse(0L);
         Long modifyTime = Opt.ofNullable((Long) redissonClient.getBucket(RedisKeyEnum.CONTRACT_SYNC_NEW_TIME.getVal()).get()).orElse(0L);
@@ -681,7 +681,7 @@ public class ContractRunner {
         log.info("【结束】计算门店维保状态");
         log.info("【结束】计算门店维保状态");
     }
     }
 
 
-    @Scheduled(cron = "0 10 * ? * *")
+    @Scheduled(cron = "0 10 8-20 ? * *")
     public void syncContractFile() {
     public void syncContractFile() {
         contractService.syncContractFile(null);
         contractService.syncContractFile(null);
     }
     }

src/main/java/vion/interceptor/InterceptorConfig.java

@@ -19,8 +19,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                 }))
                 }))
                 .addPathPatterns("/api/**")
                 .addPathPatterns("/api/**")
                 .excludePathPatterns("/api/dictionarys")
                 .excludePathPatterns("/api/dictionarys")
-                .excludePathPatterns("/api/upLoadFile", "/api/ding/callback/**", "/api/ding/getPlatformToken", "/api" +
-                        "/wechat/**", "/error")
+                .excludePathPatterns("/api/upLoadFile", "/api/ding/callback/**", "/api/ding/getPlatformToken", "/api/wechat/**", "/error")
                 .excludePathPatterns("/api/order/sign/*")
                 .excludePathPatterns("/api/order/sign/*")
                 .excludePathPatterns("/api/form/sign/*")
                 .excludePathPatterns("/api/form/sign/*")
                 .excludePathPatterns("/api/wechatCallback")
                 .excludePathPatterns("/api/wechatCallback")

src/main/java/vion/model/Contract.java

@@ -60,7 +60,7 @@ public class Contract {
     private Date maintainEdate;
     private Date maintainEdate;
 
 
     /**
     /**
-     * 合同进度：1-签订 2-到货 3-系统验收（初验） 4-项目验收（终验） 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款
+     * 合同进度：1-签订 2-到货 3-系统验收（初验） 4-项目验收（终验） 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款 9-维保进度款 10-维保验收款
      */
      */
     @TableField(value = "\"status\"")
     @TableField(value = "\"status\"")
     private Integer status;
     private Integer status;

src/main/java/vion/model/ContractPayment.java

@@ -30,7 +30,7 @@ public class ContractPayment {
     private Long contractId;
     private Long contractId;
 
 
     /**
     /**
-     * 付款方式：1-签订 2-到货 3-系统验收 4-项目验收 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款
+     * 付款方式：1-签订 2-到货 3-系统验收 4-项目验收 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款 9-维保进度款 10-维保验收款
      */
      */
     @TableField(value = "payment_type")
     @TableField(value = "payment_type")
     private Integer paymentType;
     private Integer paymentType;

src/main/java/vion/vo/ContractVO.java

@@ -6,6 +6,7 @@ import com.github.liaochong.myexcel.core.annotation.ExcelModel;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import vion.model.ContractLog;
 import vion.model.ContractLog;
+import vion.model.ContractPayment;
 import vion.model.RContractProduct;
 import vion.model.RContractProduct;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -58,9 +59,9 @@ public class ContractVO {
     private Date maintainEdate;
     private Date maintainEdate;
 
 
     /**
     /**
-     * 合同进度：1-签订 2-到货 3-系统验收（初验） 4-项目验收（终验） 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款
+     * 合同进度：1-签订 2-到货 3-系统验收（初验） 4-项目验收（终验） 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款 9-维保进度款 10-维保验收款
      */
      */
-    @ExcelColumn(order = 7, title = "合同进度", mapping = "1:合同签订,2:到货,3:系统验收,4:项目验收,5:质保,6:第一笔维保款,7:第二笔维保款,8:第三笔维保款")
+    @ExcelColumn(order = 7, title = "合同进度", mapping = "1:合同签订,2:到货,3:系统验收,4:项目验收,5:质保,6:第一笔维保款,7:第二笔维保款,8:第三笔维保款,9:维保进度款,10:维保验收款")
     private Integer status;
     private Integer status;
 
 
     /**
     /**
@@ -174,4 +175,6 @@ public class ContractVO {
     private List<ContractLog> contractLogs;
     private List<ContractLog> contractLogs;
 
 
     private List<RContractProduct> contractProducts;
     private List<RContractProduct> contractProducts;
+
+    private List<ContractPayment> contractPayments;
 }
 }
\ No newline at end of file