移动端审批记录以及分页列表添加taskId、实例id

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.scm.api.scmvehiclegression;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -75,4 +74,9 @@ public class AppScmVehicleGressionPageVo implements Vo {
     @ApiModelProperty("是否显示临时出门证按钮 审批流程完成后并且未上传现场照片时显示")
     private boolean showDownloadBtn;
 
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -53,7 +53,9 @@
                svg.applicantName                               as applyName,
                svg.applicantDate                               as applyDate,
                svg.applicantFunds                              as applyPrice,
-               svg.temporaryCard                               as downloadUrl
+               svg.temporaryCard                               as downloadUrl,
+               svg.taskId,
+               svg.procInstId
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.app.flowable;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +15,6 @@ public class AppFlowableRecordQuery implements Query {
     @ApiModelProperty(value = "流程实例id")
     private String progressId;
 
-    @ApiModelProperty(value = "流程id")
+//    @ApiModelProperty(value = "流程id")
-    private String deployId;
+//    private String deployId;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -31,8 +31,8 @@ public class AppService {
         ResultBean<List<AppFlowableRecordVo>> rb = ResultBean.fireFail();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String procInsId = appFlowableRecordQuery.getProgressId();
-        String deployId = appFlowableRecordQuery.getDeployId();
+//        String deployId = appFlowableRecordQuery.getDeployId();
-        ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId);
+        ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId);
         List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());
         voList.removeAll(Collections.singleton(null));
         for (AppFlowableRecordVo vo : voList) {
@@ -41,7 +41,7 @@ public class AppService {
                 //类型
                 String type = commentVo.getType();
                 String comment = commentVo.getComment();
-                if(StringUtils.isNotBlank(comment) ){
+                if (StringUtils.isNotBlank(comment)) {
                     vo.setContent(comment);
                 }
                 String stateValue = FlowComment.getRemarkByType(type);