提交新增合同文件校验

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1328,16 +1328,14 @@ public class KwcContractTradeService {
         updateKwcContractTrade.setId(kwcContractTrade.getId());
         updateKwcContractTrade.setRemark(req.getRemark());
         //审核  审核后变成待签约
-        if (Objects.equals(req.getStatus(), ContractStatusEnum.SUBMIT.getCode()) && Objects.equals(kwcContractTrade.getStatus(), ContractStatusEnum.WAIT_APPROVE.getCode())) {
-            updateKwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
-        }
         //审核拒绝 （状态由待审核变成已作废）
         if (Objects.equals(req.getStatus(), ContractStatusEnum.CANNEL.getCode())
                 && Arrays.asList(ContractStatusEnum.WAIT_APPROVE.getCode(), ContractStatusEnum.SUBMIT.getCode()).contains(kwcContractTrade.getStatus())) {
             updateKwcContractTrade.setStatus(ContractStatusEnum.CANNEL.getCode());
         }
-        //签约 （状态由带签约变成签约）
-        if (Objects.equals(req.getStatus(), ContractStatusEnum.SIGNED.getCode()) && Objects.equals(kwcContractTrade.getStatus(), ContractStatusEnum.SUBMIT.getCode())) {
+        //签约 （状态由带签约或者待审核变成签约）
+        if (Objects.equals(req.getStatus(), ContractStatusEnum.SIGNED.getCode()) &&
+                Arrays.asList(ContractStatusEnum.SUBMIT.getCode(), ContractStatusEnum.WAIT_APPROVE.getCode()).contains(kwcContractTrade.getStatus())) {
             updateKwcContractTrade.setStatus(ContractStatusEnum.SIGNED.getCode());
             updateKwcContractTrade.setSignTime(new Date());
         }