push

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

@@ -25,6 +25,7 @@ import com.yd.csf.service.service.*;
 import com.yd.csf.service.utils.GSONUtil;
 import com.yd.csf.service.utils.GSONUtil;
 import com.yd.oss.feign.client.ApiMaterialFeignClient;
 import com.yd.oss.feign.client.ApiMaterialFeignClient;
 import com.yd.oss.feign.client.ApiRelObjectMaterialFeignClient;
 import com.yd.oss.feign.client.ApiRelObjectMaterialFeignClient;
+import com.yd.oss.feign.dto.ApiRelMaterialDto;
 import com.yd.oss.feign.request.ApiMaterialListRequest;
 import com.yd.oss.feign.request.ApiMaterialListRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.request.ApiRelObjectMaterialListAddRequest;
 import com.yd.oss.feign.response.ApiMaterialListResponse;
 import com.yd.oss.feign.response.ApiMaterialListResponse;
@@ -116,9 +117,6 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
     private ApiRelObjectMaterialFeignClient apiRelObjectMaterialFeignClient;
     private ApiRelObjectMaterialFeignClient apiRelObjectMaterialFeignClient;
 
 
     @Autowired
     @Autowired
-    private ApiMaterialFeignClient apiMaterialFeignClient;
-
-    @Autowired
     private PolicyFollowService policyFollowService;
     private PolicyFollowService policyFollowService;
     @Resource
     @Resource
     private PolicyService policyService;
     private PolicyService policyService;
@@ -257,7 +255,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         //新增健康问卷和预约对象关系绑定
         //新增健康问卷和预约对象关系绑定
         objectSaveJkQuestion(appointment.getAppointmentBizId());
         objectSaveJkQuestion(appointment.getAppointmentBizId());
         //新增对象材料关系信息
         //新增对象材料关系信息
-        addRelObjectMaterialList(appointment.getAppointmentBizId());
+        addRelObjectMaterialList(appointment.getAppointmentBizId(),request.getMaterialDtoList());
         //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
         //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
         updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());
         updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());
         ApiAppointmentAddResponse response = new ApiAppointmentAddResponse();
         ApiAppointmentAddResponse response = new ApiAppointmentAddResponse();
@@ -270,22 +268,23 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
      * @param appointmentBizId
      * @param appointmentBizId
      * @return
      * @return
      */
      */
-    public Result addRelObjectMaterialList(String appointmentBizId) {
-        ApiMaterialListRequest request = new ApiMaterialListRequest();
-        request.setObjectType(CommonEnum.UID_TYPE_APPOINTMENT.getCode());
-        //列表查询-材料基础信息
-        Result<List<ApiMaterialListResponse>> result = apiMaterialFeignClient.list(request);
-        List<String> materialBizIdList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(result.getData())) {
-            materialBizIdList = result.getData().stream().map(ApiMaterialListResponse::getMaterialBizId).collect(Collectors.toList());
-        }
+    public Result addRelObjectMaterialList(String appointmentBizId,
+                                           List<ApiAppointmentMaterialDto> dtoList) {
         //添加-单个对象和材料列表关系信息
         //添加-单个对象和材料列表关系信息
         ApiRelObjectMaterialListAddRequest addRequest = new ApiRelObjectMaterialListAddRequest();
         ApiRelObjectMaterialListAddRequest addRequest = new ApiRelObjectMaterialListAddRequest();
-        addRequest.setMaterialBizIdList(materialBizIdList);
         addRequest.setObjectBizId(appointmentBizId);
         addRequest.setObjectBizId(appointmentBizId);
         addRequest.setObjectName(CommonEnum.UID_TYPE_APPOINTMENT.getName());
         addRequest.setObjectName(CommonEnum.UID_TYPE_APPOINTMENT.getName());
         addRequest.setObjectTableName(CommonEnum.UID_TYPE_APPOINTMENT.getCode());
         addRequest.setObjectTableName(CommonEnum.UID_TYPE_APPOINTMENT.getCode());
         addRequest.setObjectType(CommonEnum.UID_TYPE_APPOINTMENT.getCode());
         addRequest.setObjectType(CommonEnum.UID_TYPE_APPOINTMENT.getCode());
+        if (!CollectionUtils.isEmpty(dtoList)) {
+            List<ApiRelMaterialDto> materialDtoList = dtoList.stream().map(d -> {
+                ApiRelMaterialDto materialDto = new ApiRelMaterialDto();
+                materialDto.setFileBizIdList(d.getFileBizIdList());
+                materialDto.setMaterialBizId(d.getMaterialBizId());
+                return materialDto;
+            }).collect(Collectors.toList());
+            addRequest.setMaterialDtoList(materialDtoList);
+        }
         apiRelObjectMaterialFeignClient.addRelObjectMaterialList(addRequest);
         apiRelObjectMaterialFeignClient.addRelObjectMaterialList(addRequest);
         return Result.success();
         return Result.success();
     }
     }

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

+package com.yd.csf.feign.dto.appointment;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiAppointmentMaterialDto {
+
+    /**
+     * 材料信息表唯一业务ID
+     */
+    private String materialBizId;
+
+    /**
+     * 文件元数据表唯一业务ID列表
+     */
+    private List<String> fileBizIdList;
+}

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

 package com.yd.csf.feign.request.appointment;
 package com.yd.csf.feign.request.appointment;
 
 
 import com.yd.csf.feign.dto.appointment.*;
 import com.yd.csf.feign.dto.appointment.*;
-import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
@@ -47,5 +46,9 @@ public class ApiAppointmentAddRequest {
      */
      */
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
 
 
+    /**
+     * 附件信息
+     */
+    private List<ApiAppointmentMaterialDto> materialDtoList;
 
 
 }
 }