push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

@@ -252,8 +252,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         apiBeneficiaryService.batchAddBeneficiaryData(request.getApiBeneficiaryInfoFzDto().getApiBeneficiaryInfoDtoList(), appointment.getAppointmentBizId());
         //添加第二持有人信息表数据
         apiSecondHolderService.addSecondHolderData(request.getApiSecondHolderInfoDto(), appointment.getAppointmentBizId());
-        //新增健康问卷和预约对象关系绑定
-        objectSaveJkQuestion(appointment.getAppointmentBizId());
+        //新增健康问卷和预约对象关系绑定，和答题提交
+        objectSaveJkQuestion(appointment.getAppointmentBizId(),request.getApiAnswerSaveRequest());
         //新增对象材料关系信息
         addRelObjectMaterialList(appointment.getAppointmentBizId(),request.getMaterialDtoList());
         //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
@@ -354,7 +354,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
         updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());
         //新增健康问卷和预约对象关系绑定
-        objectSaveJkQuestion(appointment.getAppointmentBizId());
+        objectSaveJkQuestion(appointment.getAppointmentBizId(),request.getApiAnswerSaveRequest());
 
         return Result.success();
     }
@@ -1125,13 +1125,18 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Result objectSaveJkQuestion(String appointmentBizId) {
+    public Result objectSaveJkQuestion(String appointmentBizId,
+                                       ApiAnswerSaveRequest apiAnswerSaveRequest) {
         ApiObjectSaveRequest apiObjectSaveRequest = new ApiObjectSaveRequest();
         apiObjectSaveRequest.setObjectBizId(appointmentBizId);
         apiObjectSaveRequest.setObjectName("预约");
         apiObjectSaveRequest.setObjectTableName("appointment");
         apiObjectSaveRequest.setQuestionnaireBizId("questionnaires_1001");
         apiQuestionnairesFeignClient.objectSave(apiObjectSaveRequest);
+        //问卷-答题提交接口
+        apiAnswerSaveRequest.setObjectBizId(appointmentBizId);
+        apiAnswerSaveRequest.setQuestionnaireBizId("questionnaires_1001");
+        apiQuestionnairesFeignClient.answerSave(apiAnswerSaveRequest);
         return Result.success();
     }
 

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiAppointmentInfoDto.java

@@ -33,7 +33,7 @@ public class ApiAppointmentInfoDto {
     /**
      * 关联客户编号（和客户信息表唯一业务ID是一对，唯一，冗余字段）
      */
-    @NotBlank(message = "签约信息-关联客户编号不能为空")
+//    @NotBlank(message = "签约信息-关联客户编号不能为空")
     private String customerNo;
 
     /**

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiInsurantInfoDto.java

@@ -35,7 +35,7 @@ public class ApiInsurantInfoDto {
     /**
      * 关联客户编号（和客户信息表唯一业务ID是一对，唯一，冗余字段）
      */
-    @NotBlank(message = "受保人-关联客户编号不能为空", groups = GroupValid.NotSelf.class)
+//    @NotBlank(message = "受保人-关联客户编号不能为空", groups = GroupValid.NotSelf.class)
     private String customerNo;
 
     /**

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiPolicyholderInfoDto.java

@@ -34,7 +34,7 @@ public class ApiPolicyholderInfoDto {
     /**
      * 关联客户编号（和客户信息表唯一业务ID是一对，唯一，冗余字段）
      */
-    @NotBlank(message = "投保人-关联客户编号不能为空")
+//    @NotBlank(message = "投保人-关联客户编号不能为空")
     private String customerNo;
 
     //-- 以下基础信息

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentAddRequest.java

 package com.yd.csf.feign.request.appointment;
 
 import com.yd.csf.feign.dto.appointment.*;
+import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -51,4 +52,9 @@ public class ApiAppointmentAddRequest {
      */
     private List<ApiAppointmentMaterialDto> materialDtoList;
 
+    /**
+     * 问卷-答题提交对象
+     */
+    private ApiAnswerSaveRequest apiAnswerSaveRequest;
+
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentAddStorageRequest.java

 package com.yd.csf.feign.request.appointment;
 
 import com.yd.csf.feign.dto.appointment.*;
+import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -41,4 +42,9 @@ public class ApiAppointmentAddStorageRequest {
      * 第二持有人信息
      */
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
+
+    /**
+     * 问卷-答题提交对象
+     */
+    private ApiAnswerSaveRequest apiAnswerSaveRequest;
 }