From 6681cfa813fda6b896b2b398f3646e6aaac1f02b Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Wed, 27 Jul 2022 21:18:12 +0800 Subject: [PATCH] =?UTF-8?q?formVariables=20=E4=B8=9A=E5=8A=A1=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=9B=86=E5=90=88=20=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/biz/flow/FlowableRest.java | 11 +++++-- .../flowable/biz/flow/FlowableService.java | 6 ++-- .../biz/flowtask/FlowTaskService.java | 27 ++++++++++------ .../ScmVehicleReturnService.java | 31 +++++++++++++++++-- 4 files changed, 59 insertions(+), 16 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index cf159b3a8a..b4f2ad02d8 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -186,6 +186,8 @@ public class FlowableRest implements FlowableFeign { if (StringUtils.isBlank(dto.getBusinessSid())) { return rb.setMsg("businessSid 不能为空！"); } + if(dto.getFormVariables()==null) + dto.setFormVariables(new HashMap()); dto.getFormVariables().put("businessSid",dto.getBusinessSid()); String nextNodeUserSids_ = dto.getNextNodeUserSids(); if(StringUtils.isBlank(nextNodeUserSids_)){ @@ -217,7 +219,7 @@ public class FlowableRest implements FlowableFeign { public ResultBean handleProsess(BusinessVariables dto) { UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); ResultBean rb = ResultBean.fireFail(); - Map formVariables = dto.getFormVariables(); + // Map formVariables = dto.getFormVariables(); String taskId = dto.getTaskId(); if (StringUtils.isBlank(taskId)) { @@ -226,9 +228,12 @@ public class FlowableRest implements FlowableFeign { if (StringUtils.isBlank(dto.getBusinessSid())) { return rb.setMsg("businessSid 不能为空！"); } - if(formVariables==null){ + /*if(formVariables==null){ return rb.setMsg("业务参数集合 不能为空！"); - } + }*/ + if(dto.getFormVariables()==null) + dto.setFormVariables(new HashMap()); + Map formVariables = dto.getFormVariables(); formVariables.put("businessSid",dto.getBusinessSid()); String nextUserSid = dto.getNextNodeUserSids(); if(StringUtils.isBlank(nextUserSid)){ diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java index 4120ebdf65..83b7b47fb9 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java @@ -49,9 +49,11 @@ public class FlowableService extends MybatisBaseService()); bv.getFormVariables().put("businessSid",bv.getBusinessSid()); ResultBean rb = flowDefinitionService.businessStart(bv); if (!rb.getSuccess()) { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index e8f2390c12..39e8b01c0d 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -114,9 +114,11 @@ public class FlowTaskService extends MybatisBaseService()); List flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables()); List collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList()); for (int i = 0; i < collect.size(); i++) { @@ -736,10 +738,13 @@ public class FlowTaskService extends MybatisBaseService businessComplete(BusinessVariables dto) { ResultBean rb = ResultBean.fireFail(); - Map formVariables = dto.getFormVariables(); - if(dto.getFormVariables()==null){ + + /* if(dto.getFormVariables()==null){ return rb.setMsg("业务参数集合 不能为空！"); - } + }*/ + if(dto.getFormVariables()==null) + dto.setFormVariables(new HashMap()); + Map formVariables = dto.getFormVariables(); // formVariables.put("handleUrl", dto.getHandleUrl()); // formVariables.put("detailUrl", dto.getDetailUrl()); String taskId = (String) formVariables.get("taskId"); @@ -1537,9 +1542,11 @@ public class FlowTaskService extends MybatisBaseService()); List flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables()); ResultBean>> rb = new ResultBean>>(); List> list = new ArrayList<>(); @@ -1576,9 +1583,11 @@ public class FlowTaskService extends MybatisBaseService()); List flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables()); ResultBean>> rb = new ResultBean>>(); List> list = new ArrayList<>(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index d89b61fd1c..0c8826bc41 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -4,6 +4,9 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto; +import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign; +import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleUpdateQuery; import com.yxt.anrui.base.common.enums.BillTypeEnum; @@ -35,12 +38,15 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiModelProperty; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotBlank; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,7 +59,8 @@ import java.util.Map; */ @Service public class ScmVehicleReturnService extends MybatisBaseService { - + @Autowired + private BaseManufacturerRetwareFeign baseManufacturerRetwareFeign; @Autowired private ScmVehicleReturnDetailsService scmVehicleReturnDetailsService; @Autowired @@ -286,6 +293,26 @@ public class ScmVehicleReturnService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(booad.getUserSid()); + ResultBean staff = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()); + brd.setCreateOrgSid(staff.getData().getOrgSid()); // 创建组织sid + List baseManufacturerRetwareVehs=new ArrayList<>(); + //detailsList.forEach(item->baseManufacturerRetwareVehs.add(new BaseManufacturerRetwareVehDto())); + for(int i=0;i 0); ResultBean processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv); processCirculationNodesByMap.setCode("200"); processCirculationNodesByMap.setSuccess(true);