Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

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

@@ -486,4 +486,7 @@ public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectWenDan",method = RequestMethod.GET)
     Map<String, Object> selectWenDan(@RequestParam("taskId")String taskId);
+
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/questionsAndAnswers",method = RequestMethod.GET)
+    BusProcessNew questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer);
 }

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

@@ -442,4 +442,8 @@ public class workFlowFeignClientImpl {
     public Map<String, Object> selectWenDan(@RequestParam("taskId") String taskId) {
         return workFlowFeignClient.selectWenDan(taskId);
     }
+
+    public BusProcessNew questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) {
+        return workFlowFeignClient.questionsAndAnswers(askId,answerer);
+    }
 }

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

@@ -1094,5 +1094,9 @@ public class WorkFlowController {
         }
         return Result.success();
     }
-
+    @ApiOperation(value = "问答中心 个人中心 我的问答 回答无taskID问题")
+    @GetMapping("/questionsAndAnswers")
+    public BusProcessNew questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) {
+        return workFlowFeignClient.questionsAndAnswers(askId,answerer);
+    }
 }