diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java index c5be147a3b..eb182f7dc2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java @@ -30,7 +30,7 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 75e01cb47e..0c89d07571 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -18,7 +18,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -75,7 +74,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService pv1 = PagerUtil.pageToVo(page, pv); List voList = pv1.getRecords(); if (voList.size() > 0) { - for (int i = 0; i < voList.size(); i++) { + /* for (int i = 0; i < voList.size(); i++) { ResultBean resultBean = sysFormLinkFeign.selectStateByBusinessSid(voList.get(i).getSid()); if (resultBean.getSuccess() && resultBean.getData() != null) { SysFormStateVo formState = resultBean.getData(); @@ -84,6 +83,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService map = (Map) businessResultBean.getData(); //更新未售买断业务表中的流程状态 - modifyFlowState(businessSid, + /* modifyFlowState(businessSid, ProcDefEnum.SCMVEHICLERETURN.getProDefId(), map.get("nodeState"), map.get("procInsId"), map.get("taskDefKey") - ); + );*/ + modifyFlowState(businessSid, + ProcDefEnum.SALESORDER.getProDefId(), + map.get("nodeState"), + map.get("procInsId"), + map.get("taskDefKey"), + map.get("taskId")); return rb.success(); } else { return rb.setMsg(businessResultBean.getMsg()); @@ -256,7 +268,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService