合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!40

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

@@ -483,4 +483,7 @@ public interface workFlowFeignClient {
     String selectAskId(@RequestParam("taskId") String taskId);
     @RequestMapping(value = "/bat-wkflow/busProcessModel/selectOnlineFile",method = RequestMethod.POST)
     List<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId);
+
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectWenDan",method = RequestMethod.GET)
+    Map<String, Object> selectWenDan(@RequestParam("taskId")String taskId);
 }

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

@@ -438,4 +438,8 @@ public class workFlowFeignClientImpl {
     public  List<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId) {
         return workFlowFeignClient.selectOnlineFile(taskId);
     }
+
+    public Map<String, Object> selectWenDan(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectWenDan(taskId);
+    }
 }

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

@@ -996,4 +996,10 @@ public class WorkFlowController {
         return workFlowFeignClient.selectOnlineFile(taskId);
     }
 
+    @ApiOperation(value = "查询问题和回答")
+    @GetMapping("/selectWenDan")
+    public Map<String,Object> selectWenDan(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectWenDan(taskId);
+    }
+
 }