diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 2847901e22..a20d233320 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -591,6 +591,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java index 30f0514676..5f2cd376ac 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java @@ -47,10 +47,6 @@ public class FlowableFallback implements FlowableFeign{ return null; } - @Override - public ResultBean complete(Map variables) { - return null; - } @Override public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { @@ -67,11 +63,6 @@ public class FlowableFallback implements FlowableFeign{ return null; } - @Override - public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) { - return null; - } - @Override public ResultBean stopProcess(FlowTaskVo flowTaskVo) { return null; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java index fa960eabf8..efa672af79 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java @@ -96,10 +96,10 @@ public interface FlowableFeign { * @param variables 表单参数 * @return */ - @ApiOperation(value = "办理(同意)") + /* @ApiOperation(value = "办理(同意)") @PostMapping("/complete") public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map variables); - +*/ /** * 流程撤回 * @@ -137,11 +137,11 @@ public interface FlowableFeign { public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid, @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); - @ApiOperation(value = "终止任务") + /* @ApiOperation(value = "终止任务") @PostMapping(value = "/breakProcess/{businessSid}") public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid, @RequestBody FlowTaskVo flowTaskVo); - +*/ /** * 取消申请 * diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 296a025e32..8f231774b4 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -117,10 +117,10 @@ public class FlowableRest implements FlowableFeign { return flowableService.doneTaskList(userSid, pQuery); } - @Override + /* @Override public ResultBean complete(Map variables) { return flowableService.complete(variables); - } + }*/ @Override public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { @@ -137,10 +137,10 @@ public class FlowableRest implements FlowableFeign { return flowableService.taskReject(businessSid, flowTaskVo); } - @Override + /* @Override public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) { return flowableService.breakProcess(businessSid, flowTaskVo); - } + }*/ @Override public ResultBean stopProcess(FlowTaskVo flowTaskVo) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index dd4460af4c..41b7a553a1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -228,7 +228,7 @@ public class FlowableService extends MybatisBaseService variables) { + /* public ResultBean complete(Map variables) { BusinessVariables bv = BusinessVariables.builder().build(); bv.setFormVariables(variables); ResultBean resultBean = flowTaskFeign.businessComplete(bv); @@ -254,7 +254,7 @@ public class FlowableService extends MybatisBaseService