From f95be0577be21dcddbed9db4ea0ea75057029423 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Tue, 13 Dec 2022 09:28:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3lawss/a?= =?UTF-8?q?ctiviti/get=5Flist=5Fby=5Finstance=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=B1=87=E6=80=BB=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 +++- .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) 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 f0340450..cc100ecb 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 @@ -355,6 +355,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/get_list_by_instance",method = RequestMethod.GET) List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu); + @RequestMapping(value = "/bat-wkflow/task/get_gather_by_instance",method = RequestMethod.GET) + List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu); + /** * @Author yuzhong * 获取图片 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 add2e314..32f71718 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 @@ -340,7 +340,9 @@ public class workFlowFeignClientImpl { public List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); } - + public List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu); + } public byte[] getImg(@RequestParam("prcNum")String prcNum){ return workFlowFeignClient.getImg(prcNum); } 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 2099b410..12ec1abb 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 @@ -734,6 +734,12 @@ public class WorkFlowController { return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu); } + @ApiOperation(value = "流程实例汇总列表") + @GetMapping("/get_gather_by_instance") + public List> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){ + return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu); + } + @ApiOperation(value = "获取图片") @GetMapping("/getImg") public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException { From 1c2df15b0098da7140a1c63fde3def93fad4b682 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Wed, 14 Dec 2022 13:34:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3/queryTas?= =?UTF-8?q?kIndex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 7 +++++++ .../adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 3 +++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ++++++ 3 files changed, 16 insertions(+) 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 cc100ecb..1bcf4188 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 @@ -284,6 +284,13 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/queryTaskFirst",method = RequestMethod.GET) BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId); + /** + * 查询指定任务index + * @param bpnId + * @return + */ + @RequestMapping(value = "/bat-wkflow/queryTaskIndex",method = RequestMethod.GET) + BusProcessName queryTaskIndex(@RequestParam("bpnId") String bpnId,@RequestParam("index")Integer index); /** * 查询草稿 * @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 32f71718..47cdb64b 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,6 +303,9 @@ 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 List queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){ List busProcessNames = workFlowFeignClient.queryTaskDraft(taskCommonQuery); 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 12ec1abb..80ee78ab 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 @@ -619,6 +619,12 @@ public class WorkFlowController { return workFlowFeignClient.queryTaskFirst(bpnId); } + @ApiOperation(value = "查询任务第index步") + @GetMapping("/queryTaskIndex") + public BusProcessName queryTaskIndex(@RequestParam("bpnId") String bpnId,@RequestParam("index")Integer index){ + return workFlowFeignClient.queryTaskIndex(bpnId,index); + } + @ApiOperation(value = "查询草稿") @PostMapping("/queryTaskDraft") public PageInfo queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){ From bcb2fb738f503597aca13df29d35ae726fecdeb4 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Thu, 15 Dec 2022 09:55:07 +0800 Subject: [PATCH 3/6] =?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 = "查询草稿") From 163b59a05ce62763557a748d6e7c5de52b11e654 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Thu, 15 Dec 2022 14:55:43 +0800 Subject: [PATCH 4/6] =?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?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- .../adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++-- .../adc/da/workFlow/controller/WorkFlowController.java | 8 +++----- 3 files changed, 7 insertions(+), 9 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 2f44b18d..f4f0dd54 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 @@ -285,12 +285,12 @@ public interface workFlowFeignClient { BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId); /** - * 查询指定任务index + * 查询指定任务 * @param prcId * @return */ @RequestMapping(value = "/bat-wkflow/queryTaskIndex",method = RequestMethod.GET) - BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId); + BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds); /** * 查询草稿 * @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 a6397232..eda8627b 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 BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){ - return workFlowFeignClient.queryTaskIndex(prcId); + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){ + return workFlowFeignClient.queryTaskIndex(prcId,taskIds); } public List queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){ 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 f47d9c03..1534ff4a 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 @@ -619,12 +619,10 @@ public class WorkFlowController { return workFlowFeignClient.queryTaskFirst(bpnId); } - @ApiOperation(value = "查询任务第index步") + @ApiOperation(value = "查询taskid任务") @GetMapping("/queryTaskIndex") - public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId){ - BusProcessNew busProcessNew = workFlowFeignClient.queryTaskIndex(prcId); - return busProcessNew; - + public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){ + return workFlowFeignClient.queryTaskIndex(prcId,taskIds); } @ApiOperation(value = "查询草稿") From 54c3f04e659e2b3b6086e5f2b72c2c885032e9ed Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Fri, 23 Dec 2022 09:13:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E/decodeDetail=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 +++- .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 5 +++++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) 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 f4f0dd54..da499c7a 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 @@ -285,7 +285,7 @@ public interface workFlowFeignClient { BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId); /** - * 查询指定任务 + * 查询指定任务(此接口暂无调用) * @param prcId * @return */ @@ -451,6 +451,8 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/inboundLiaisonDetailForXZYQ",method = RequestMethod.GET) BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds); + @RequestMapping(value = "/bat-wkflow/decodeDetail",method = RequestMethod.GET) + BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pid")String pId); @RequestMapping(value = "/bat-wkflow/queryBusProcessNameForEnd",method = RequestMethod.POST) List queryBusProcessNameForEnd(@RequestBody String taskId); 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 eda8627b..c00706be 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 @@ -14,6 +14,8 @@ import com.adc.da.workFlow.entity.ProcessRollBackEO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletRequest; @@ -398,6 +400,9 @@ public class workFlowFeignClientImpl { public BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds){ return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds); } + public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pid")String pId){ + return workFlowFeignClient.decodeDetail(taskIds,pId); + } public List queryBusProcessNameForEnd(@RequestBody String prcNum){ return workFlowFeignClient.queryBusProcessNameForEnd(prcNum); } 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 1534ff4a..7351ae9a 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 @@ -889,6 +889,12 @@ public class WorkFlowController { return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds); } + @ApiOperation(value = "行政管理要求评估流程详情") + @GetMapping("/decodeDetail") + public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pid")String pId){ + return workFlowFeignClient.decodeDetail(taskIds,pId); + } + @ApiOperation(value = "采购保存接口") @PostMapping("/saveCgSq") public Wrapper saveCgSq(BusMes busMes) { From 5f220ee1c20c52fc070f62014005f497ab631d72 Mon Sep 17 00:00:00 2001 From: dingbingqing Date: Fri, 23 Dec 2022 15:37:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9/decodeDetail=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 2 +- .../com/adc/da/workFlow/controller/WorkFlowController.java | 4 ++-- 3 files changed, 4 insertions(+), 4 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 da499c7a..51ae72a0 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 @@ -452,7 +452,7 @@ public interface workFlowFeignClient { BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds); @RequestMapping(value = "/bat-wkflow/decodeDetail",method = RequestMethod.GET) - BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pid")String pId); + BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId); @RequestMapping(value = "/bat-wkflow/queryBusProcessNameForEnd",method = RequestMethod.POST) List queryBusProcessNameForEnd(@RequestBody String taskId); 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 c00706be..fa997022 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 @@ -400,7 +400,7 @@ public class workFlowFeignClientImpl { public BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds){ return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds); } - public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pid")String pId){ + public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pId")String pId){ return workFlowFeignClient.decodeDetail(taskIds,pId); } public List queryBusProcessNameForEnd(@RequestBody String prcNum){ 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 7351ae9a..3c6c4c82 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 @@ -889,9 +889,9 @@ public class WorkFlowController { return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds); } - @ApiOperation(value = "行政管理要求评估流程详情") + @ApiOperation(value = "标准解读流程汇总详情") @GetMapping("/decodeDetail") - public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds,@RequestParam("pid")String pId){ + public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId){ return workFlowFeignClient.decodeDetail(taskIds,pId); }