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) {