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

# Conflicts:
#	yd-question-api/src/main/java/com/yd/question/api/service/ApiQuestionnairesService.java

yd-question-api/src/main/java/com/yd/question/api/controller/ApiQuestionnairesController.java

@@ -3,6 +3,7 @@ package com.yd.question.api.controller;
 import com.yd.common.result.Result;
 import com.yd.question.api.service.ApiQuestionnairesService;
 import com.yd.question.feign.client.ApiQuestionnairesFeignClient;
+import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import com.yd.question.feign.request.ApiBatchSaveAnswerRequest;
 import com.yd.question.feign.request.ApiObjectSaveRequest;
@@ -29,17 +30,19 @@ public class ApiQuestionnairesController implements ApiQuestionnairesFeignClient
 
     /**
      * 获取问卷详细信息-单个问卷详细信息
+     *
      * @param questionnaireBizId 问卷唯一业务ID
-     * @param objectBizId 对象业务ID
+     * @param objectBizId        对象业务ID
      * @return
      */
     @Override
     public Result<ApiQuestionnairesDetailResponse> detail(String questionnaireBizId, String objectBizId) {
-        return apiQuestionnairesService.detail(questionnaireBizId,objectBizId);
+        return apiQuestionnairesService.detail(questionnaireBizId, objectBizId);
     }
 
     /**
      * 问卷-答题提交接口
+     *
      * @return
      */
     @Override
@@ -47,8 +50,14 @@ public class ApiQuestionnairesController implements ApiQuestionnairesFeignClient
         return apiQuestionnairesService.answerSave(request);
     }
 
+    @Override
+    public Result<ApiAnswerSessionsDto> answerSession(String questionnaireBizId, String objectBizId) {
+        return apiQuestionnairesService.answerSession(questionnaireBizId, objectBizId);
+    }
+
     /**
      * 问卷-业务对象绑定
+     *
      * @return
      */
     @Override

yd-question-api/src/main/java/com/yd/question/api/service/ApiQuestionnairesService.java

 package com.yd.question.api.service;
 
 import com.yd.common.result.Result;
+import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import com.yd.question.feign.request.ApiBatchSaveAnswerRequest;
 import com.yd.question.feign.request.ApiObjectSaveRequest;
@@ -14,5 +15,7 @@ public interface ApiQuestionnairesService {
 
     Result objectSave(ApiObjectSaveRequest request);
 
+    Result<ApiAnswerSessionsDto> answerSession(String questionnaireBizId, String objectBizId);
+
     Result batchSaveAnswer(ApiBatchSaveAnswerRequest request);
 }

yd-question-api/src/main/java/com/yd/question/api/service/impl/ApiQuestionnairesServiceImpl.java

@@ -486,6 +486,12 @@ public class ApiQuestionnairesServiceImpl implements ApiQuestionnairesService {
         return Result.success();
     }
 
+    @Override
+    public Result<ApiAnswerSessionsDto> answerSession(String questionnaireBizId, String objectBizId) {
+        ApiAnswerSessionsDto apiAnswerSessionsDto = answerSessionsDto(objectBizId, questionnaireBizId, null);
+        return Result.success(apiAnswerSessionsDto);
+    }
+
     /**
      * 问卷-批量复制新增答题会话
      * @return

yd-question-feign/src/main/java/com/yd/question/feign/client/ApiQuestionnairesFeignClient.java

 package com.yd.question.feign.client;
 
 import com.yd.common.result.Result;
+import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import com.yd.question.feign.fallback.ApiQuestionnairesFeignFallbackFactory;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import com.yd.question.feign.request.ApiBatchSaveAnswerRequest;
@@ -38,6 +39,16 @@ public interface ApiQuestionnairesFeignClient {
     Result<ApiAnswerSaveResponse> answerSave(@Validated @RequestBody ApiAnswerSaveRequest request);
 
     /**
+     * 获取问卷-答题会话接口
+     * @param questionnaireBizId 问卷唯一业务ID
+     * @param objectBizId 对象业务ID
+     * @return
+     */
+    @GetMapping("/answer_session")
+    Result<ApiAnswerSessionsDto> answerSession(@RequestParam(value = "questionnaireBizId") String questionnaireBizId,
+                                               @RequestParam(value = "objectBizId") String objectBizId);
+
+    /**
      * 问卷-业务对象绑定
      * @return
      */

yd-question-feign/src/main/java/com/yd/question/feign/fallback/ApiQuestionnairesFeignFallbackFactory.java

@@ -2,6 +2,7 @@ package com.yd.question.feign.fallback;
 
 import com.yd.common.result.Result;
 import com.yd.question.feign.client.ApiQuestionnairesFeignClient;
+import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import com.yd.question.feign.request.ApiBatchSaveAnswerRequest;
 import com.yd.question.feign.request.ApiObjectSaveRequest;
@@ -31,6 +32,11 @@ public class ApiQuestionnairesFeignFallbackFactory implements FallbackFactory<Ap
             }
 
             @Override
+            public Result<ApiAnswerSessionsDto> answerSession(String questionnaireBizId, String objectBizId) {
+                return null;
+            }
+
+            @Override
             public Result objectSave(ApiObjectSaveRequest request) {
                 return null;
             }