From f97c7feb5190ecef1a2a089d37bd4c757f05014a Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 11 Jun 2019 14:17:16 +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 +- .../java/com/iformall/domain/po/WxFlowConfig.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) 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 895948742..f5b73740c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -213,7 +213,7 @@ public class WxFlowAbleController extends BaseController { @ApiOperation(value = "根据id查询模板",notes = "") @GetMapping(value = "findModelById") @SystemControllerLog(description = "工作流-根据id查询模板") - public ResultData findById(@RequestBody WxFlowModel wxFlowModel){ + public ResultData findById(@ModelAttribute WxFlowModel wxFlowModel){ wxFlowModel.setTenantId(getTenantId()); return wxFlowService.findModelById(wxFlowModel); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index cebc6cd62..a67b23957 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -1,10 +1,8 @@ package com.iformall.domain.po; -import com.iformall.domain.vo.UserTaskVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -29,19 +27,24 @@ public class WxFlowConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") private String name; - @io.swagger.annotations.ApiModelProperty(value="类型",name="type") + @io.swagger.annotations.ApiModelProperty(value="流程类型1合同审批2账单审批3终止合同4有价卷上架",name="type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value="创建用户",name="createUser") + @io.swagger.annotations.ApiModelProperty(value="状态0启用 1停用",name="status") private Integer status; + @io.swagger.annotations.ApiModelProperty(value="模板id",name="modelId") + private Long modelId; + @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") private Date updateDate; + private WxFlowModel wxFlowModel; + @Transient - private List lists; + private List childs; }