优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -2114,6 +2114,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return rb;
     }
 
+
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusMainDeposit busMainDeposit = fetchBySid(bv.getBusinessSid());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.fin.api.finbillapplication.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -78,4 +79,7 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     int selectBySid(String join);
 
     FinBillApplicationDetailsVo fetchByQkkpBillNo(String qkkpBillNo);
+
+    @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}")
+    void updateZZ(String businessSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2456,6 +2456,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
                 finBillVehicleService.updateByMainSid(finBillApplication.getSid());
+                baseMapper.updateZZ(query.getBusinessSid());
                 return rb.success().setData(resultBean.getData());
             }
         }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -52,6 +52,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
+import liquibase.pro.packaged.S;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.UserTask;
@@ -174,6 +175,7 @@ public class FlowableRest implements FlowableFeign {
             return rb.setMsg("抄送失败！");
         }
         Map<String, Object> processVariables = historicTaskInstance.getProcessVariables();
+        String createrOrgPath = (String) processVariables.get("createrOrgPath");
         if (historicTaskInstance == null) {
             log.info("抄送失败：没有获取到业务参数!");
             return rb.setMsg("抄送失败！");
@@ -205,6 +207,7 @@ public class FlowableRest implements FlowableFeign {
         }
         userSids.deleteCharAt(userSids.length() - 1);
         mfq.setUserSids(userSids.toString());
+        mfq.setOrgPath(createrOrgPath);
         ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
         log.info("抄送成功:{}", userName.toString());
         log.info("抄送成功-resultBean:{}", resultBean);

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/feign/form/MessageFlowableQuery.java

@@ -31,5 +31,5 @@ public class MessageFlowableQuery implements Query {
     private String userSids;
 
     private String userSid;
-
+    private String orgPath;
 }