Browse Source

修改11

master
dimengzhe 2 years ago
parent
commit
2168a225f5
  1. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  2. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
  3. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -119,7 +119,7 @@ public interface BusSalesOrderFeign {
ResultBean taskReject(@RequestBody BusSalesOrderFlowDto dto);
@ApiOperation(value = "终止任务")
@PutMapping("/breakProcess")
@PostMapping("/breakProcess")
@ResponseBody
ResultBean breakProcess(@RequestBody BusSalesOrderFlowDto dto);

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@ -288,11 +288,13 @@ public class FlowableRest implements FlowableFeign {
//根据流程定义key查询终止地址
SysUrlConfig sysUrlConifg = sysUrlConfigService.selectByKey(proDefKey);
if(sysUrlConifg != null){
f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
// f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
f.setStopUrl(sysUrlConifg.getUrl());
}else{
sysUrlConifg = sysUrlConfigService.selectByKey("defaultKey");
if(sysUrlConifg!= null){
f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
// f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
f.setStopUrl(sysUrlConifg.getUrl());
}
}
}

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@ -689,11 +689,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
//根据流程定义key查询终止地址
SysUrlConfig sysUrlConifg = sysUrlConfigService.selectByKey(proDefKey);
if(sysUrlConifg != null){
f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
// f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
f.setStopUrl(sysUrlConifg.getUrl());
}else{
sysUrlConifg = sysUrlConfigService.selectByKey("defaultKey");
if(sysUrlConifg!= null){
f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
// f.setStopUrl(urlPrefix+sysUrlConifg.getUrl());
f.setStopUrl(sysUrlConifg.getUrl());
}
}

Loading…
Cancel
Save