Merge remote-tracking branch 'origin/muti_db' into muti_db

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -1,5 +1,7 @@
 package com.qs.serve.modules.tbs.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -698,6 +700,16 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         if(flowId!=null&&flowId.length()>45){
             flowId = flowId.substring(0,40);
         }
+        // 协议类发起
+        if(tbsCostApply.getContractFlag().equals(1)){
+            if(flowIdResult.getMsg()!=null && flowIdResult.getMsg().length()>45){
+                log.error(flowIdResult.getMsg());
+                JSONObject object = JSON.parseObject(flowIdResult.getMsg());
+                if(!object.get("code").toString().equals("0")){
+                    Assert.throwEx("流程发起被拦截了");
+                }
+            }
+        }
         String formId = null;
         R<String> formIdResult = seeYonService.getFormId(templateCode,tbsCostApply.getId());
         if(formIdResult.getStatus()==200){
@@ -915,7 +927,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("cmsLink",baseJumpUrl);
 
         data.put("rowDate",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
-        data.put("rowState","03");
+        //初始化00
+        data.put("rowState","00");
 
         //拓展添加审批关联区域
         String saleRegionId = supplier.handleSaleRegionId();

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -166,6 +167,10 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
             TbsActivity activity = new TbsActivity();
             activity.setId(verification.getActivityId());
             activity.setActivityState(TbsActivityState.STATE_0_Todo);
+            if(tbsActivity.getPreCheckDate().isBefore(LocalDate.now())){
+                activity.setReopenFlag(1);
+                activity.setPreEndDateBack(LocalDate.now().plusDays(3));
+            }
             tbsActivityService.updateById(activity);
         }
         return null;
@@ -193,6 +198,10 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
                 }else {
                     activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo);
                 }
+                if(activity.getPreCheckDate().isBefore(LocalDate.now())){
+                    activity4Upd.setReopenFlag(1);
+                    activity4Upd.setPreEndDateBack(LocalDate.now().plusDays(3));
+                }
                 tbsActivityService.updateById(activity4Upd);
             }
             //更新金额，已完成

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -853,6 +853,11 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setAmount(totalAmount);
         verification.setAmountRecord(totalAmount);
 
+        try {
+            Thread.sleep(20000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         //保存
         this.saveOrUpdate(verification);
         this.commitSy(activity,sysUser,verification,saleBizNames,bizBizNames);