Просмотр исходного кода

[审批流][修改][init]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
f97c7feb51
2 измененных файлов: 9 добавлений и 6 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  2. +8
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java

+ 1
- 1
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);
}


+ 8
- 5
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<UserTaskVo> lists;
private List<WxFlowConfig> childs;

}

Загрузка…
Отмена
Сохранить