push

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

@@ -257,7 +257,12 @@ public class ApiQuestionnairesServiceImpl implements ApiQuestionnairesService {
                 BeanUtils.copyProperties(d,apiQuestionsDto);
                 BeanUtils.copyProperties(d,apiQuestionsDto);
                 apiQuestionsDto.setId(d.getQuestionId());
                 apiQuestionsDto.setId(d.getQuestionId());
                 //问题的选项列表信息
                 //问题的选项列表信息
-                apiQuestionsDto.setOptionsDtoList(optionsDtoList(questionnaireBizId,d.getQuestionBizId()));
+                List<ApiOptionsDto> apiOptionsDtoList = optionsDtoList(questionnaireBizId,d.getQuestionBizId());
+                apiQuestionsDto.setOptionsDtoList(apiOptionsDtoList);
+                if (!CollectionUtils.isEmpty(apiOptionsDtoList)) {
+                    List<String> optionBizIdList = apiOptionsDtoList.stream().map(ApiOptionsDto::getOptionBizId).collect(Collectors.toList());
+                    apiQuestionsDto.setAddQuestionsDtoList(addQuestionsDtoList(questionnaireBizId,d.getQuestionBizId(),optionBizIdList));
+                }
                 //答题会话对象（实际回答的内容）
                 //答题会话对象（实际回答的内容）
                 apiQuestionsDto.setAnswerSessionsDto(answerSessionsDto(objectBizId,questionnaireBizId,d.getQuestionBizId()));
                 apiQuestionsDto.setAnswerSessionsDto(answerSessionsDto(objectBizId,questionnaireBizId,d.getQuestionBizId()));
 
 
@@ -291,7 +296,7 @@ public class ApiQuestionnairesServiceImpl implements ApiQuestionnairesService {
                     ApiOptionsDto apiOptionsDto = new ApiOptionsDto();
                     ApiOptionsDto apiOptionsDto = new ApiOptionsDto();
                     BeanUtils.copyProperties(d,apiOptionsDto);
                     BeanUtils.copyProperties(d,apiOptionsDto);
                     //选项附加问题列表
                     //选项附加问题列表
-                    apiOptionsDto.setAddQuestionsDtoList(addQuestionsDtoList(questionnaireBizId,questionBizId,d.getOptionBizId()));
+//                    apiOptionsDto.setAddQuestionsDtoList(addQuestionsDtoList(questionnaireBizId,questionBizId,d.getOptionBizId()));
                     return apiOptionsDto;
                     return apiOptionsDto;
                 }).collect(Collectors.toList());
                 }).collect(Collectors.toList());
             }
             }
@@ -304,6 +309,34 @@ public class ApiQuestionnairesServiceImpl implements ApiQuestionnairesService {
      * 选项附加问题列表
      * 选项附加问题列表
      * @param questionnaireBizId
      * @param questionnaireBizId
      * @param questionBizId
      * @param questionBizId
+     * @param optionBizIdList
+     * @return
+     */
+    public List<ApiAddQuestionsDto> addQuestionsDtoList(String questionnaireBizId,
+                                                        String questionBizId,
+                                                        List<String> optionBizIdList) {
+        List<ApiAddQuestionsDto> apiAddQuestionsDtoList = new ArrayList<>();
+        List<RelOptionsAddQuestions> relOptionsAddQuestionsList = iRelOptionsAddQuestionsService.queryList(questionnaireBizId,questionBizId,optionBizIdList);
+        if (!CollectionUtils.isEmpty(relOptionsAddQuestionsList)) {
+            List<String> addQuestionsBizIdList = relOptionsAddQuestionsList.stream()
+                    .map(RelOptionsAddQuestions::getAddQuestionsBizId)
+                    .collect(Collectors.toList());
+            List<AddQuestions> addQuestionsList = iAddQuestionsService.queryList(addQuestionsBizIdList);
+            if (!CollectionUtils.isEmpty(addQuestionsList)) {
+                apiAddQuestionsDtoList = addQuestionsList.stream().map(d -> {
+                    ApiAddQuestionsDto apiAddQuestionsDto = new ApiAddQuestionsDto();
+                    BeanUtils.copyProperties(d,apiAddQuestionsDto);
+                    return apiAddQuestionsDto;
+                }).collect(Collectors.toList());
+            }
+        }
+        return apiAddQuestionsDtoList;
+    }
+
+    /**
+     * 选项附加问题列表
+     * @param questionnaireBizId
+     * @param questionBizId
      * @param optionBizId
      * @param optionBizId
      * @return
      * @return
      */
      */

yd-question-feign/src/main/java/com/yd/question/feign/dto/ApiQuestionsDto.java

@@ -70,6 +70,11 @@ public class ApiQuestionsDto {
     private List<ApiOptionsDto> optionsDtoList;
     private List<ApiOptionsDto> optionsDtoList;
 
 
     /**
     /**
+     * 选项附加问题列表
+     */
+    private List<ApiAddQuestionsDto> addQuestionsDtoList;
+
+    /**
      * 答题会话对象（实际回答的内容）
      * 答题会话对象（实际回答的内容）
      */
      */
     private ApiAnswerSessionsDto answerSessionsDto;
     private ApiAnswerSessionsDto answerSessionsDto;

yd-question-service/src/main/java/com/yd/question/service/service/IRelOptionsAddQuestionsService.java

@@ -19,4 +19,8 @@ public interface IRelOptionsAddQuestionsService extends IService<RelOptionsAddQu
     List<RelOptionsAddQuestions> queryList(String questionnaireBizId,
     List<RelOptionsAddQuestions> queryList(String questionnaireBizId,
                                         String questionBizId,
                                         String questionBizId,
                                         String optionBizId);
                                         String optionBizId);
+
+    List<RelOptionsAddQuestions> queryList(String questionnaireBizId,
+                                           String questionBizId,
+                                           List<String> optionBizIdList);
 }
 }

yd-question-service/src/main/java/com/yd/question/service/service/impl/RelOptionsAddQuestionsServiceImpl.java

@@ -8,6 +8,7 @@ import com.yd.question.service.service.IRelOptionsAddQuestionsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -40,4 +41,16 @@ public class RelOptionsAddQuestionsServiceImpl extends ServiceImpl<RelOptionsAdd
         );
         );
         return list;
         return list;
     }
     }
+
+    @Override
+    public List<RelOptionsAddQuestions> queryList(String questionnaireBizId,
+                                                  String questionBizId,
+                                                  List<String> optionBizIdList) {
+        List<RelOptionsAddQuestions> list = baseMapper.selectList(new LambdaQueryWrapper<RelOptionsAddQuestions>()
+                .eq(StringUtils.isNotBlank(questionnaireBizId),RelOptionsAddQuestions::getQuestionnaireBizId,questionnaireBizId)
+                .eq(StringUtils.isNotBlank(questionBizId),RelOptionsAddQuestions::getQuestionBizId,questionBizId)
+                .in(!CollectionUtils.isEmpty(optionBizIdList),RelOptionsAddQuestions::getOptionBizId,optionBizIdList)
+        );
+        return list;
+    }
 }
 }