From 14093dea4310a5cb3f2df304f0bbd0daa0fba087 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 11 Jun 2019 14:00:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/workflow/WxFlowAbleController.java | 2 +- .../db/migration/V201906111337__L_ALTER_FLOW.sql | 13 +++++++++++++ .../iformall/service/impl/WxFlowServiceImpl.java | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906111337__L_ALTER_FLOW.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 2acd21f9a..31b8387ad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -211,7 +211,7 @@ public class WxFlowAbleController extends BaseController { * 根据id查询模板 */ @ApiOperation(value = "根据id查询模板",notes = "") - @PostMapping(value = "findModelById") + @GetMapping(value = "findModelById") @SystemControllerLog(description = "工作流-根据id查询模板") public ResultData findById(@RequestBody WxFlowModel wxFlowModel){ wxFlowModel.setTenantId(getTenantId()); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906111337__L_ALTER_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201906111337__L_ALTER_FLOW.sql new file mode 100644 index 000000000..07887d13f --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906111337__L_ALTER_FLOW.sql @@ -0,0 +1,13 @@ +drop table if exists `wx_flow_config`; +CREATE TABLE `wx_flow_config` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `parent_id` bigint(20) NOT NULL COMMENT '父类id', + `tenant_id` varchar(10) NOT NULL COMMENT '租户id', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `type` tinyint(1) DEFAULT '0' COMMENT '流程类型1合同审批2账单审批3终止合同', + `status` tinyint(1) DEFAULT '0' COMMENT '状态0启用 1停用', + `model_id` bigint(20) NOT NULL COMMENT '模板id', + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 434676445..0782a1790 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -99,7 +99,7 @@ public class WxFlowServiceImpl implements WxFlowService { private WxFlowModelMapper wxFlowModelMapper; /** - * 获取流程key,1合同 2账单 + * 获取流程key * @param flowType * @return */