From bcb2fb738f503597aca13df29d35ae726fecdeb4 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Thu, 15 Dec 2022 09:55:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9/queryTaskIndex=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 4 +- .../workFlowFeignClientImpl.java | 4 +- .../java/com/adc/da/common/BusProcessNew.java | 40 +++++++++++++++++++ .../controller/WorkFlowController.java | 6 ++- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 1bcf4188..2f44b18d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/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 diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 47cdb64b..a6397232 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/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){ - return workFlowFeignClient.queryTaskIndex(bpnId,index); + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){ + return workFlowFeignClient.queryTaskIndex(prcId); } public List queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java index ad7a3939..04005416 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java +++ b/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; + /** *

* @@ -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) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 80ee78ab..f47d9c03 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/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){ - return workFlowFeignClient.queryTaskIndex(bpnId,index); + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){ + BusProcessNew busProcessNew = workFlowFeignClient.queryTaskIndex(prcId); + return busProcessNew; + } @ApiOperation(value = "查询草稿")