push

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

@@ -104,6 +104,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
         premiumReconciliation.setInsuranceCompany(policy.getInsuranceCompany());
         premiumReconciliation.setInsuranceCompany(policy.getInsuranceCompany());
         //保单号
         //保单号
         premiumReconciliation.setPolicyNo(policy.getPolicyNo());
         premiumReconciliation.setPolicyNo(policy.getPolicyNo());
+        premiumReconciliation.setReconciliationType(apiPremiumReconciliationDto.getReconciliationType());
         //保费对账记录表唯一业务ID
         //保费对账记录表唯一业务ID
         premiumReconciliation.setPremiumReconciliationBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_PREMIUM_RECONCILIATION.getCode()));
         premiumReconciliation.setPremiumReconciliationBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_PREMIUM_RECONCILIATION.getCode()));
         //对账状态 - 保司对账中
         //对账状态 - 保司对账中

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -153,6 +154,14 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
         List<ApiPremiumRemittanceDto> dtoList = list.stream().map(dto -> {
         List<ApiPremiumRemittanceDto> dtoList = list.stream().map(dto -> {
             ApiPremiumRemittanceDto remittanceDto = new ApiPremiumRemittanceDto();
             ApiPremiumRemittanceDto remittanceDto = new ApiPremiumRemittanceDto();
             BeanUtils.copyProperties(dto,remittanceDto);
             BeanUtils.copyProperties(dto,remittanceDto);
+            //支付凭证列表
+            remittanceDto.setPaymentVoucherList(StringUtils.isNotBlank(dto.getPaymentVoucher()) ? Arrays.asList(dto.getPaymentVoucher().split(";").clone()) : new ArrayList<>());
+            //账户证明列表
+            remittanceDto.setAccountVerificationList(StringUtils.isNotBlank(dto.getAccountVerification()) ? Arrays.asList(dto.getAccountVerification().split(";").clone()) : new ArrayList<>());
+
+            //其他资料列表
+            List<ApiPremiumRemittanceFileDto> fileDtoList = apiPremiumRemittanceFileService.apiPremiumRemittanceFileDtoList(dto.getPremiumRemittanceBizId());
+            remittanceDto.setApiPremiumRemittanceFileDtoList(fileDtoList);
             return remittanceDto;
             return remittanceDto;
         }).collect(Collectors.toList());
         }).collect(Collectors.toList());
         return dtoList;
         return dtoList;