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

欠款提车、出库申请的添加工作名称为合同编号+流程名称

master
dimengzhe 2 years ago
parent
90a065d8c0
commit
1cc26a9b84
11 changed files with 163 additions and 29 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. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  2. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeQuery.java
  4. 54
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  5. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
  6. 66
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  7. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  8. 22
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcessMapQuery.java
  9. 5
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java
  10. 5
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java
  11. 12
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
View File

@ -130,7 +130,7 @@ public interface BusDeliveredApplyFeign {
@ResponseBody
public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query);
@ApiOperation("验证是否可出库")
/* @ApiOperation("验证是否可出库")
@PostMapping("/checkingApply")
// @ResponseBody
@ApiIgnore
@ -140,17 +140,17 @@ public interface BusDeliveredApplyFeign {
// @ResponseBody
@PostMapping(value = "examine")
@ApiIgnore
ResultBean examine(@RequestBody BusDeExamineQuery busDeExamineQuery);
ResultBean examine(@RequestBody BusDeExamineQuery busDeExamineQuery);*/
@ApiOperation("出库审核分页列表")
@PostMapping("/listExaminePage")
@ResponseBody
public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(@RequestBody PagerQuery<BusDeliveredExamineQuery> pq);
@ApiOperation("提交出库审批流程")
/* @ApiOperation("提交出库审批流程")
@PostMapping("/submitDeliveredApply")
@ResponseBody
public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);
public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);*/
@ApiOperation(value = "办理（同意）")

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
View File

@ -86,7 +86,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
return rb.setMsg("接口anrui-buscenter/busdeliveredapply/fetchDetailsBySid无法访问");
}
@Override
/* @Override
public ResultBean checkingApply(CheckingApplyQuery query) {
return null;
}
@ -94,17 +94,17 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
@Override
public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
return null;
}
}*/
@Override
public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(PagerQuery<BusDeliveredExamineQuery> pq) {
return null;
}
@Override
/* @Override
public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
return null;
}
}*/
@Override
public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeQuery.java
View File

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

54
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -47,6 +47,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -1667,7 +1668,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@ -1680,6 +1680,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
//流程定义id
bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId());
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -1791,7 +1797,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
} else {
variables.put("jinrong", false);
}
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busArrearsCarryVehicleApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//===============================================
bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
if ("Activity_1dsv0io".equals(bv.getTaskDefKey()) && StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) {
@ -1805,6 +1818,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
}
if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -1891,7 +1905,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busArrearsCarryVehicleApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//===============================================
bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@ -1975,7 +1996,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
appMap.put("sid", bv.getBusinessSid());
map.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busArrearsCarryVehicleApply.getProcDefId());
flowProcessMapQuery.setVariables(map);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
map = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(map);
//===============================================
bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@ -1996,6 +2024,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
appMap.put("sid", bv.getBusinessSid());
map.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busArrearsCarryVehicleApply.getProcDefId());
flowProcessMapQuery.setVariables(map);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
map = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(map);
//===============================================
bv.setFormVariables(map);
bv.setModelId(busArrearsCarryVehicleApply.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@ -2026,6 +2062,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
variables.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busArrearsCarryVehicleApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//===============================================
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -2048,7 +2091,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
@ -2083,13 +2125,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
variables.put("app", appMap);
//=================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busArrearsCarryVehicleApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busArrearsCarryVehicleApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//===============================================
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg("操作失败!");
}
String nextNodeUserSids = resultBean.getData().getNextNodeUserSids();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
String nextName = listResultBean.getData().get(0).getName_();

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
View File

@ -147,7 +147,7 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
return vo;
}
@Override
/* @Override
public ResultBean checkingApply(CheckingApplyQuery query) {
return busDeliveredApplyService.checkingApply(query);
}
@ -155,7 +155,7 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
@Override
public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
return busDeliveredApplyService.examine(busDeExamineQuery);
}
}*/
@Override
public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(PagerQuery<BusDeliveredExamineQuery> pq) {
@ -164,10 +164,10 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
return rb.success().setData(pv);
}
@Override
/* @Override
public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
return busDeliveredApplyService.submitDeliveredApply(dto);
}
}*/
@Override
public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {

66
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -86,6 +86,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -472,7 +473,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
* @param busDeExamineQuery 条件
* @return
*/
public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
/* public ResultBean examine(BusDeExamineQuery busDeExamineQuery) {
ResultBean rb = ResultBean.fireFail();
int state = busDeExamineQuery.getState();
if (state == 4) {
@ -498,9 +499,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
baseMapper.updateState(busDeExamineQuery.getSid(), state);
}
return rb.success().setMsg("审核操作成功");
}
}*/
public ResultBean checkingApply(CheckingApplyQuery query) {
/* public ResultBean checkingApply(CheckingApplyQuery query) {
ResultBean rb = ResultBean.fireFail();
//待出库车辆点击出库申请
BusDeliveredApplyDetailVo busDeliveredApplyDetailVo = query.getDetailVo();
@ -516,7 +517,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg("选择的必须为同一合同编号的车辆");
}
return rb.success();
}
}*/
/**
* 提交审批流程
@ -524,7 +525,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
* @param dto
* @return
*/
public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
/* public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgSidPath = dto.getOrgPath();
BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
@ -541,6 +542,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg(resultBean.getMsg());
}
String sid = resultBean.getData();
busDeliveredApply = fetchBySid(sid);
String businessSid = resultBean.getData();
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
@ -554,9 +556,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -587,7 +594,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return complete(bv);
}
return rb;
}
}*/
/**
* 更新流程相关的状态
@ -637,6 +644,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean rb = ResultBean.fireFail();
BusDeliveredApply busDeliveredApply = fetchBySid(bv.getBusinessSid());
bv.setOrgSidPath(busDeliveredApply.getOrgSidPath());
Map<String,Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
appMap.put("outboundSid", bv.getBusinessSid());
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
bv.setModelId(busDeliveredApply.getProcDefId());
if (bv.getTaskId().equals(busDeliveredApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -1036,7 +1058,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
if(StringUtils.isNotBlank(query.getBusinessSid())){
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
}else{
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.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());
@ -1053,7 +1080,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
if(StringUtils.isNotBlank(query.getBusinessSid())){
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
}else{
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.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());
@ -1085,6 +1117,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -1732,7 +1769,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@ -1740,8 +1778,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
//流程定义id
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -4549,8 +4549,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//用户sid
bv.setUserSid(busSalesOrder.get().getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
//流程定义id

22
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcessMapQuery.java
View File

@ -0,0 +1,22 @@
package com.yxt.anrui.flowable.api.flow;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Map;
/**
* @description: 流程获取map
* @author: dimengzhe
* @date: 2023/5/26
**/
@Data
public class FlowProcessMapQuery {
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("变量")
private Map<String, Object> variables;
@ApiModelProperty("流程id")
private String proDefKey;
}

5
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java
View File

@ -101,5 +101,10 @@ public class FlowableFallback implements FlowableFeign {
return null;
}
@Override
public ResultBean<Map<String, Object>> getMap(FlowProcessMapQuery query) {
return null;
}
}

5
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java
View File

@ -146,4 +146,9 @@ public interface FlowableFeign {
@GetMapping(value = "/selectFlows")
@ResponseBody
ResultBean<FlowSelectVo> selectFlows(@RequestParam("proDefId")String proDefId,@RequestParam("proInsId")String proInsId);
@ApiOperation(value = "获取map")
@PostMapping(value = "/getMap")
@ResponseBody
ResultBean<Map<String,Object>> getMap(@RequestBody FlowProcessMapQuery query);
}

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

@ -720,4 +720,16 @@ public class FlowableRest implements FlowableFeign {
public ResultBean<FlowSelectVo> selectFlows(String proDefId, String proInsId) {
return flowableService.selectFlows(proDefId,proInsId);
}
@Override
public ResultBean<Map<String, Object>> getMap(FlowProcessMapQuery query) {
ResultBean<Map<String,Object>> rb = ResultBean.fireFail();
Map<String,Object> variables = query.getVariables();
String contractNo = query.getContractNo();
String proDefKey = query.getProDefKey();
Map<String, String> process = processService.getProcessDefByDefId(proDefKey);
String orderNames = contractNo+process.get("NAME_");
variables.put("orderNames",orderNames);
return rb.success().setData(variables);
}
}

Write Preview
Loading…
Cancel
Save