Merge remote-tracking branch 'origin/master'

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/paymentapply/PaymentApplyVo.java

@@ -34,4 +34,9 @@ public class PaymentApplyVo {
 
     @ApiModelProperty("用款金额")
     private String money;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/qualityrelease/QualityReleaseVo.java

@@ -28,4 +28,9 @@ public class QualityReleaseVo {
 
     @ApiModelProperty("创建时间")
     private String createTime;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/api/warehousingpledge/WarehousingPledgeVo.java

@@ -31,5 +31,10 @@ public class WarehousingPledgeVo implements Vo {
     @ApiModelProperty("创建时间")
     private String createTime;
 
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+
 
 }

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/paymentapply/PaymentApplyMappper.xml

@@ -9,7 +9,9 @@
                applyUse,
                money,
                DATE_FORMAT(createTime, '%Y-%m-%d')         as createTime,
-               if(length(nodeState) > 0, nodeState, '待提交') as nodeState
+               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+               procDefId,
+               procInstId
         from payment_apply
         <where>
             ${ew.sqlSegment}

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/qualityrelease/QualityReleaseMapper.xml

@@ -7,7 +7,9 @@
                projectName,
                createByName,
                DATE_FORMAT(createTime, '%Y-%m-%d')         as createTime,
-               if(length(nodeState) > 0, nodeState, '待提交') as nodeState
+               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+               procDefId,
+               procInstId
         from quality_release
         <where>
             ${ew.sqlSegment}

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/warehousingpledge/WarehousingPledgeMapper.xml

@@ -7,7 +7,9 @@
                projectName,
                createByName,
                DATE_FORMAT(createTime, '%Y-%m-%d')         as createTime,
-               if(length(nodeState) > 0, nodeState, '待提交') as nodeState
+               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+               procDefId,
+               procInstId
         from warehousing_pledge
         <where>
             ${ew.sqlSegment}