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

[审批流][添加][修复历史数据]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
645ca3d66c
2 измененных файлов: 21 добавлений и 4 удалений
  1. +6
    -0
      mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql
  2. +15
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java

+ 6
- 0
mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql Просмотреть файл

@@ -0,0 +1,6 @@



update wx_flow_record f set f.start_date =
FROM_UNIXTIME((select text_ from ACT_HI_VARINST where name_='startTime' and PROC_INST_ID_ = f.`process_instance_id`)/1000,'%Y-%m-%d %H:%i:%S')
where f.start_date is null

+ 15
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java Просмотреть файл

@@ -13,34 +13,45 @@ public class WxFlowRecord implements Serializable {

@Id
private Long id;
@io.swagger.annotations.ApiModelProperty(value="业务id",name="businessId")
private Long businessId; //业务id
@io.swagger.annotations.ApiModelProperty(value="业务类型1合同审批2账单审批3合同终止",name="businessType")
private Integer businessType;//业务类型 1合同审批2账单审批
@io.swagger.annotations.ApiModelProperty(value="用户id",name="userId")
private Long userId;//用户id
@io.swagger.annotations.ApiModelProperty(value="姓名",name="userName")
private String userName;//姓名
@io.swagger.annotations.ApiModelProperty(value="审批意见",name="remark")
private String remark;//审批意见
@io.swagger.annotations.ApiModelProperty(value="状态1发起申请2审批通过3审批驳回4待审批5合同作废6撤回",name="status")
private Integer status;//状态 1新建2审批3驳回4审批通过
@io.swagger.annotations.ApiModelProperty(value="任务id",name="taskId")
private String taskId;//任务id
@io.swagger.annotations.ApiModelProperty(value="流程实例id",name="processInstanceId")
private String processInstanceId;//流程实例id
//申请时间
@io.swagger.annotations.ApiModelProperty(value="申请时间",name="startDate")
private Date startDate;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
private String tenantId;
private String taskKey; // key
private String taskName;// 名称
@io.swagger.annotations.ApiModelProperty(value="当前状态同apply_status0未审核1审核中2审核完成3驳回4合同作废5撤回",name="currStatus")
private Integer currStatus;// 当前状态
@io.swagger.annotations.ApiModelProperty(value="流程附加值",name="variables")
private String variables;// 流程附加值

private String contractType;
private String contractNumber;
private Integer endProperty;

@Transient
protected List<Long> ids;

//是否最后一个启动节点
@Transient
private Integer isLastStart;
//申请时间
private Date startDate;
@Transient
private Integer limit;



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