From 645ca3d66cc2f0ffc89994ca2a35d48737db55f5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 19 Apr 2019 14:20:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201904191413__ADD_FLOW.sql | 6 ++++++ .../com/iformall/domain/po/WxFlowRecord.java | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201904191413__ADD_FLOW.sql new file mode 100644 index 000000000..988d6fa94 --- /dev/null +++ b/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 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index f0b1747fb..be3fd2d2a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/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 ids; - //是否最后一个启动节点 @Transient private Integer isLastStart; - //申请时间 - private Date startDate; @Transient private Integer limit;