yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

formVariables 业务参数集合 不能为空！

zhanglei
yxt_djz 3 years ago
parent
5873c182f6
commit
6681cfa813
4 changed files with 59 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  2. 6
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
  3. 27
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  4. 31
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

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

@ -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<String, Object>());
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<UpdateFlowFieldVo> handleProsess(BusinessVariables dto) {
UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
ResultBean rb = ResultBean.fireFail();
Map<String, Object> formVariables = dto.getFormVariables();
// Map<String, Object> 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<String, Object>());
Map<String, Object> formVariables = dto.getFormVariables();
formVariables.put("businessSid",dto.getBusinessSid());
String nextUserSid = dto.getNextNodeUserSids();
if(StringUtils.isBlank(nextUserSid)){

6
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
View File

@ -49,9 +49,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
if (StringUtils.isBlank(bv.getBusinessSid())) {
return ResultBean.fireFail().setMsg("businessSid 不能为空！");
}
if(bv.getFormVariables()==null){
/*if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空！");
}
}*/
if(bv.getFormVariables()==null)
bv.setFormVariables(new HashMap<String, Object>());
bv.getFormVariables().put("businessSid",bv.getBusinessSid());
ResultBean<FlowTask> rb = flowDefinitionService.businessStart(bv);
if (!rb.getSuccess()) {

27
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -114,9 +114,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (bv.getModelId() != null) {
procId = bv.getModelId();
}
if(bv.getFormVariables()==null){
/* if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空！");
}
}*/
if(bv.getFormVariables()==null)
bv.setFormVariables(new HashMap<String, Object>());
List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables());
List<FlowElement> 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<FlowTaskMapper, FlowTask
public ResultBean<FlowTask> businessComplete(BusinessVariables dto) {
ResultBean<FlowTask> rb = ResultBean.fireFail();
Map<String, Object> formVariables = dto.getFormVariables();
if(dto.getFormVariables()==null){
/* if(dto.getFormVariables()==null){
return rb.setMsg("业务参数集合 不能为空！");
}
}*/
if(dto.getFormVariables()==null)
dto.setFormVariables(new HashMap<String, Object>());
Map<String, Object> 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<FlowTaskMapper, FlowTask
if (bv.getModelId() != null) {
procId = bv.getModelId();
}
if(bv.getFormVariables()==null){
/* if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空！");
}
}*/
if(bv.getFormVariables()==null)
bv.setFormVariables(new HashMap<String, Object>());
List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables());
ResultBean<List<Map<String, Object>>> rb = new ResultBean<List<Map<String, Object>>>();
List<Map<String, Object>> list = new ArrayList<>();
@ -1576,9 +1583,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (bv.getModelId() != null) {
procId = bv.getModelId();
}
if(bv.getFormVariables()==null){
/*if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空！");
}
}*/
if(bv.getFormVariables()==null)
bv.setFormVariables(new HashMap<String, Object>());
List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables());
ResultBean<List<Map<String, Object>>> rb = new ResultBean<List<Map<String, Object>>>();
List<Map<String, Object>> list = new ArrayList<>();

31
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
View File

@ -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<ScmVehicleReturnMapper, ScmVehicleReturn> {
@Autowired
private BaseManufacturerRetwareFeign baseManufacturerRetwareFeign;
@Autowired
private ScmVehicleReturnDetailsService scmVehicleReturnDetailsService;
@Autowired
@ -286,6 +293,26 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
updateQuery.setVehicleState("0003");
updateQuery.setVihicleStateValue("采购退库中");
baseVehicleFeign.updateByVinNo(updateQuery);
BaseManufacturerRetwareDto brd=new BaseManufacturerRetwareDto();
brd.setSource("采购退库"); // 来源
brd.setOperatorName(booad.getName()); // 操作人姓名
brd.setCreateBySid(booad.getUserSid());
brd.setApplyName(booad.getName()); // 申请人姓名
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
brd.setAppluDate(sdf.format(booad.getCreateTime())); // 申请日期
brd.setNum(detailsList.size()+""); // 车辆台数
ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(booad.getUserSid());
ResultBean<SysStaffOrg> staff = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid());
brd.setCreateOrgSid(staff.getData().getOrgSid()); // 创建组织sid
List<BaseManufacturerRetwareVehDto> baseManufacturerRetwareVehs=new ArrayList<>();
//detailsList.forEach(item->baseManufacturerRetwareVehs.add(new BaseManufacturerRetwareVehDto()));
for(int i=0;i<detailsList.size();i++){
BaseManufacturerRetwareVehDto baseManufacturerRetwareVehDto = new BaseManufacturerRetwareVehDto();
baseManufacturerRetwareVehDto.setVinNo(detailsList.get(i).getVinNo());
baseManufacturerRetwareVehs.add(baseManufacturerRetwareVehDto);
}
brd.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehs);//aseManufacturerRetwareVehs;
baseManufacturerRetwareFeign.save(brd);
}
return rb1;
} else {
@ -494,7 +521,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
bv.setTaskDefKey(scmVehicleReturnDto.getTaskDefKey());
bv.setFormVariables(BeanUtil.beanToMap(scmVehicleReturnDto));
bv.getFormVariables().put("isLoan", true);
bv.getFormVariables().put("isLoan", new BigDecimal(scmVehicleReturnDto.getMoney()).compareTo(new BigDecimal("0")) > 0);
ResultBean processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
processCirculationNodesByMap.setCode("200");
processCirculationNodesByMap.setSuccess(true);

Write Preview
Loading…
Cancel
Save