优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -29,7 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
@@ -43,7 +44,6 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceIn
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto;
@@ -64,7 +64,6 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
-import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -347,7 +346,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         variables.put("businessSid", businessSid);
         variables.put("isLoan", true);
         variables.put("orgSid", orgSid);//部门sid
-        ResultBean resultBean = flowableService.businessStart(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables);
+        ResultBean resultBean = flowableService.businessStart("", dto.getUserSid(), variables);
         if (resultBean.getSuccess() && resultBean.getData() != null) {
             Map<String, String> map = (Map<String, String>) resultBean.getData();
             saveSysFormLink(map);
@@ -662,7 +661,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         appMap.put("contractSid", businessSid);
         variables.put("app", appMap);
         //流程定义id
-        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
+//        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
@@ -982,7 +981,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         //判断流程分支
 //        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
 //        bv.setFormVariables(map);
-        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
+//        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -997,7 +996,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         //判断流程分支
 //        Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
 //        bv.setFormVariables(map);
-        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
+//        bv.setModelId(ProcDefEnum.BUSCENTERADVANCEGINVOICEAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());