push

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointmentfile/ItineraryDto.java

@@ -12,37 +12,31 @@ import java.time.LocalDateTime;
 public class ItineraryDto {
 public class ItineraryDto {
 
 
     /**
     /**
-     * 集合时间（到港时间）
+     * 集合时间（签约信息-签单日）
      */
      */
     @PdfField("arrivalTime")
     @PdfField("arrivalTime")
     private String arrivalTime;
     private String arrivalTime;
 
 
     /**
     /**
-     * 集合地点（字典）（会面地点）
+     * 集合地点（字典）（签约信息-签约地点）
      */
      */
     @PdfField("meetingPoint")
     @PdfField("meetingPoint")
     private String meetingPoint;
     private String meetingPoint;
 
 
     /**
     /**
-     * 意向地点（签单地址）
-     */
-    @PdfField("signingAddress")
-    private String signingAddress;
-
-    /**
-     * 业务代表1姓名
+     * 业务代表1姓名（签单员姓名）
      */
      */
     @PdfField("businessRepresentName1")
     @PdfField("businessRepresentName1")
     private String businessRepresentName1;
     private String businessRepresentName1;
 
 
     /**
     /**
-     * 业务代表1电话号码区号
+     * 业务代表1电话号码区号（签单员电话号码区号）
      */
      */
     @PdfField("businessRepresentMobile1Code")
     @PdfField("businessRepresentMobile1Code")
     private String businessRepresentMobile1Code;
     private String businessRepresentMobile1Code;
 
 
     /**
     /**
-     * 业务代表1电话号码
+     * 业务代表1电话号码（签单员电话号码）
      */
      */
     @PdfField("businessRepresentMobile1")
     @PdfField("businessRepresentMobile1")
     private String businessRepresentMobile1;
     private String businessRepresentMobile1;
@@ -54,24 +48,24 @@ public class ItineraryDto {
     private String name;
     private String name;
 
 
     /**
     /**
-     * 受保人（受保人姓名）
-     */
-    @PdfField("insurantName")
-    private String insurantName;
-
-    /**
      * 意向缴费年期（产品计划-供款年期（字典））
      * 意向缴费年期（产品计划-供款年期（字典））
      */
      */
     @PdfField("paymentTerm")
     @PdfField("paymentTerm")
     private String paymentTerm;
     private String paymentTerm;
 
 
     /**
     /**
-     * 意向年缴保费（产品计划-每期保费）
+     * 首期保费（产品计划-每期保费）
      */
      */
     @PdfField("eachIssuePremium")
     @PdfField("eachIssuePremium")
     private String eachIssuePremium;
     private String eachIssuePremium;
 
 
     /**
     /**
+     * 保单征费
+     */
+    @PdfField("policyFee")
+    private String policyFee;
+
+    /**
      * 币种（产品计划-货币（字典））
      * 币种（产品计划-货币（字典））
      */
      */
     @PdfField("currency")
     @PdfField("currency")
@@ -89,27 +83,37 @@ public class ItineraryDto {
     @PdfField("total")
     @PdfField("total")
     private String total;
     private String total;
 
 
-    /**
-     * 客户姓名前缀
-     */
-    @PdfField("np")
-    private String np;
 
 
-    /**
-     * 备注
-     */
-    @PdfField("remark")
-    private String remark;
 
 
-    /**
-     * 确定预约时间（年月日，时分）
-     */
-    @PdfField("confirmAppointmentTime")
-    private String confirmAppointmentTime;
+//    /**
+//     * 意向地点（签单地址）
+//     */
+//    @PdfField("signingAddress")
+//    private String signingAddress;
+//
+//    /**
+//     * 受保人（受保人姓名）
+//     */
+//    @PdfField("insurantName")
+//    private String insurantName;
+//
+//    /**
+//     * 客户姓名前缀
+//     */
+//    @PdfField("np")
+//    private String np;
+//
+//    /**
+//     * 备注
+//     */
+//    @PdfField("remark")
+//    private String remark;
+//
+//    /**
+//     * 确定预约时间（年月日，时分）
+//     */
+//    @PdfField("confirmAppointmentTime")
+//    private String confirmAppointmentTime;
+
 
 
-    /**
-     * 保单征费
-     */
-    @PdfField("policyFee")
-    private String policyFee;
 }
 }

yd-csf-service/src/main/resources/mappers/AppointmentMapper.xml

@@ -64,11 +64,16 @@
 
 
     <select id="getItineraryDto" resultType="com.yd.csf.feign.dto.appointmentfile.ItineraryDto">
     <select id="getItineraryDto" resultType="com.yd.csf.feign.dto.appointmentfile.ItineraryDto">
         select
         select
-        a.arrival_time,a.meeting_point,a.confirm_appointment_time,
-        a.signing_address,a.business_represent_name1,
-        a.business_represent_mobile1_code,a.business_represent_mobile1,
-        t.name_cn as name,i.name_cn as insurantName,pp.issue_number as paymentTerm,pp.each_issue_premium,pp.policy_levy as policyFee,
-        pp.policy_currency as currency,pp.product_launch_name as productName,(pp.each_issue_premium + pp.policy_levy) as total
+        a.sign_date as arrivalTime,a.meeting_point,
+        (select aus.name from appointment_user_sign aus where aus.appointment_biz_id = #{appointmentBizId} limit 1) as businessRepresentName1,
+        (select aus.phone from appointment_user_sign aus where aus.appointment_biz_id = #{appointmentBizId} limit 1) as businessRepresentMobile1,
+        t.name_cn as name,
+        pp.issue_number as paymentTerm,
+        pp.each_issue_premium,
+        pp.policy_levy as policyFee,
+        pp.policy_currency as currency,
+        pp.product_launch_name as productName,
+        (pp.each_issue_premium + pp.policy_levy) as total
         from appointment a
         from appointment a
         left join product_plan pp on a.appointment_biz_id = pp.appointment_biz_id and pp.is_deleted = 0
         left join product_plan pp on a.appointment_biz_id = pp.appointment_biz_id and pp.is_deleted = 0
         left join insurant i on a.appointment_biz_id = i.appointment_biz_id and i.is_deleted = 0
         left join insurant i on a.appointment_biz_id = i.appointment_biz_id and i.is_deleted = 0