修改/queryTaskIndex接口中的查询功能

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -286,11 +286,11 @@ public interface workFlowFeignClient {
 
     /**
      * 查询指定任务index
-     * @param bpnId
+     * @param prcId
      * @return
      */
     @RequestMapping(value = "/bat-wkflow/queryTaskIndex",method = RequestMethod.GET)
-    BusProcessName queryTaskIndex(@RequestParam("bpnId") String bpnId,@RequestParam("index")Integer index);
+    BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId);
     /**
      * 查询草稿
      * @param taskCommonQuery

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -303,8 +303,8 @@ public class workFlowFeignClientImpl {
     public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId){
         return workFlowFeignClient.queryTaskFirst(bpnId);
     }
-    public BusProcessName queryTaskIndex(@RequestParam("bpnId") String bpnId,@RequestParam("index")Integer index){
+    public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){
-        return workFlowFeignClient.queryTaskIndex(bpnId,index);
+        return workFlowFeignClient.queryTaskIndex(prcId);
     }
 
     public List<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){

adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java

@@ -1,12 +1,15 @@
 package com.adc.da.common;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -46,6 +49,43 @@ public class BusProcessNew {
 
     private String finishFlag;
 
+    @ApiModelProperty(value = "审批意见")
+                                                                                                                                                                                                                                                                                                                                                    @TableField("COMMIT_FLAG")
+    private String commitFlag;
+
+    @ApiModelProperty(value = "审批意见")
+    @TableField("COMMIT_TEXT")
+    private String commitText;
+
+    @ApiModelProperty(value = "子流程ID")
+    @TableField("SUB_ID")
+    private String subId;
+
+    @ApiModelProperty(value = "流程名称")
+    @TableField("PRC_NAME")
+    private String prcName;
+
+    @TableField("CREATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "OA link")
+    private String link;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "干活任务截止时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String endTime;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "任务状态 0 默认 1 审批任务 2 干活任务")
+    private int taskStatus;
+
     private long commitStatus;
 
     @TableField( exist = false)

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -621,8 +621,10 @@ public class WorkFlowController {
 
     @ApiOperation(value = "查询任务第index步")
     @GetMapping("/queryTaskIndex")
-    public BusProcessName queryTaskIndex(@RequestParam("bpnId") String bpnId,@RequestParam("index")Integer index){
+    public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){
-        return workFlowFeignClient.queryTaskIndex(bpnId,index);
+        BusProcessNew busProcessNew = workFlowFeignClient.queryTaskIndex(prcId);
+        return busProcessNew;
+
     }
 
     @ApiOperation(value = "查询草稿")