Browse Source

修复问题

master
dimengzhe 2 years ago
parent
commit
54acfaea75
  1. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/GetNodeQuery.java
  2. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/GetNodeQuery.java

@ -22,4 +22,7 @@ public class GetNodeQuery implements Query {
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty("业务sid")
private String businessSid;
}

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@ -702,9 +702,16 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
BusinessVariables bv = new BusinessVariables();
bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
bv.setTaskDefKey(query.getTaskDefKey());
bv.setFormVariables(BeanUtil.beanToMap(query));
String money = query.getFormVariables().get("money").toString();
bv.getFormVariables().put("isLoan", new BigDecimal(money).compareTo(new BigDecimal("0")) > 0);
if(StringUtils.isBlank(query.getBusinessSid())) {//pc
bv.setFormVariables(BeanUtil.beanToMap(query));
String money = query.getFormVariables().get("money").toString();
bv.getFormVariables().put("isLoan", new BigDecimal(money).compareTo(new BigDecimal("0")) > 0);
}else{//移动
ScmVehicleReturn scmVehicleReturn = fetchBySid(query.getBusinessSid());
Map<String,Object> map = new HashMap<>();
map.put("isLoan",scmVehicleReturn.getMoney().compareTo(new BigDecimal("0")) > 0);
bv.setFormVariables(map);
}
ResultBean<List<Map<String, Object>>> processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
processCirculationNodesByMap.setCode("200");
processCirculationNodesByMap.setSuccess(true);

Loading…
Cancel
Save