push

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

@@ -684,7 +684,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
                 follow.setInsured(follow.getPolicyHolder());
             }
             // 受保人年龄
-            if (apiInsurantInfoDto.getAge() != null) {
+            if (StringUtils.isNotBlank(apiInsurantInfoDto.getAge())) {
                 follow.setInsuredAge(Integer.valueOf(apiInsurantInfoDto.getAge()));
             }
         }
@@ -716,11 +716,11 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
             // 币种
             follow.setPolicyCurrency(apiProductPlanMainInfoDto.getPolicyCurrency());
             // 供款年期
-            if (apiProductPlanMainInfoDto.getIssueNumber() != null) {
+            if (StringUtils.isNotBlank(apiProductPlanMainInfoDto.getIssueNumber())) {
                 follow.setIssueNumber(Integer.parseInt(apiProductPlanMainInfoDto.getIssueNumber()));
             }
             // 保障期限
-            if (apiProductPlanMainInfoDto.getGuaranteePeriod() != null) {
+            if (StringUtils.isNotBlank(apiProductPlanMainInfoDto.getGuaranteePeriod())) {
                 follow.setGuaranteePeriod(Integer.parseInt(apiProductPlanMainInfoDto.getGuaranteePeriod()));
             }
             // 保额（重疾险）

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/excel/ApiExcelImportAppointmentDto.java

@@ -511,8 +511,8 @@ public class ApiExcelImportAppointmentDto {
         infoDto.setArrivalTime(DateUtil.getLocalDateTime(dto.getHkArrivalTime()));
         //业务编号->介绍人编号 TODO
 //        infoDto.setBusinessNo(dto.getMainReferrerId());
-        //确定预约时间->预约日期 (西元 年/月/日) + 預約時間
-//        infoDto.setConfirmAppointmentTime(DateUtil.getLocalDateTime(dto.getMainIntentionAppointmentDate() + " " + dto.getMainIntentionAppointmentTime()));
+        //签单日->预约日期 (西元 年/月/日) + 預約時間
+        infoDto.setSignDate(DateUtil.getLocalDateTime(dto.getMainIntentionAppointmentDate() + " " + dto.getMainIntentionAppointmentTime()));
         //离港时间->离港(澳)日期及时间（离港时间）（预约信息主表）
         infoDto.setDepartureTime(DateUtil.getLocalDateTime(dto.getHkDepartureTime()));
         //客户在港期间联络电话->客户在港期间联络电话（预约信息主表）区号+号码