| @@ -234,4 +234,20 @@ public class WxFlowAbleController extends BaseController { | |||||
| return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); | return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); | ||||
| } | } | ||||
| /** | |||||
| * 配置列表 | |||||
| */ | |||||
| @ApiOperation("配置列表") | |||||
| @GetMapping(value = "/configList") | |||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | |||||
| }) | |||||
| @SystemControllerLog(description = "工作流-配置列表") | |||||
| public ResultData configList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { | |||||
| logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); | |||||
| wxFlowModel.setTenantId(getTenantId()); | |||||
| return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); | |||||
| } | |||||
| } | } | ||||
| @@ -0,0 +1,47 @@ | |||||
| 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; | |||||
| import java.util.Date; | |||||
| import java.util.List; | |||||
| /** | |||||
| * @author luozukai | |||||
| * @date 2019/6/6 10:50 | |||||
| */ | |||||
| @Table(name = "wx_flow_config") | |||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxFlowConfig extends BaseEntity { | |||||
| @Id | |||||
| protected Long id; | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") | |||||
| private String name; | |||||
| @io.swagger.annotations.ApiModelProperty(value="类型",name="type") | |||||
| private Integer type; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建用户",name="createUser") | |||||
| private Integer status; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | |||||
| private Date createDate; | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") | |||||
| private Date updateDate; | |||||
| @Transient | |||||
| private List<UserTaskVo> lists; | |||||
| } | |||||
| @@ -20,7 +20,7 @@ | |||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != id "> and `id` = #{id} </if> | <if test=" null != id "> and `id` = #{id} </if> | ||||
| <if test=" null != name "> and `name` = #{name} </if> | |||||
| <if test=" null != name "> and `name` like concat('%', #{name},'%') </if> | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| <if test=" null == sortColumns"> order by id desc </if> | <if test=" null == sortColumns"> order by id desc </if> | ||||