新单跟进59

yd-csf-service/src/main/java/com/yd/csf/service/dto/CustomerAddRequest.java

@@ -153,6 +153,12 @@ public class CustomerAddRequest implements Serializable {
     @Schema(description = "证件号码")
     private String idCard;
 
+     /**
+     * 身份证地址
+     */
+    @Schema(description = "身份证地址")
+    private String idCardAddress;
+
     /**
      * 护照号
      */
@@ -260,6 +266,12 @@ public class CustomerAddRequest implements Serializable {
     private String companyAreaCode;
 
     /**
+     * 公司地址邮政编码
+     */
+    @Schema(description = "公司地址邮政编码")
+    private String companyAddressPostcode;
+
+    /**
      * 公司电话
      */
     @Schema(description = "公司电话")

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormAddRequest.java

@@ -32,6 +32,12 @@ public class FnaFormAddRequest implements Serializable {
     private PersonalData personalData;
 
     /**
+     * 税务国家列表
+     */
+    @Schema(description = "税务国家列表")
+    private List<TaxCountry> taxList;
+
+    /**
      * 家庭状况
      */
     @Schema(description = "家庭状况（父亲-father/母亲-mother/配偶-spouse/子女-children）")

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormUpdateRequest.java

@@ -36,6 +36,12 @@ public class FnaFormUpdateRequest implements Serializable {
     @Schema(description = "个人资料")
     private PersonalData personalData;
 
+     /**
+     * 税务国家列表
+     */
+    @Schema(description = "税务国家列表", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<TaxCountry> taxList;
+
     /**
      * 家庭状况
      */

yd-csf-service/src/main/java/com/yd/csf/service/dto/PersonalData.java

@@ -17,7 +17,7 @@ public class PersonalData {
     @Schema(description = "客户姓名", requiredMode = Schema.RequiredMode.REQUIRED)
     private String customerName;
 
-    @Schema(description = "税务国家", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "税务国家")
     private String taxCountry;
 
     @Schema(description = "就业情况 字典值: csf_employment", requiredMode = Schema.RequiredMode.REQUIRED)

yd-csf-service/src/main/java/com/yd/csf/service/dto/TaxCountry.java

+package com.yd.csf.service.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "税务国家")
+public class TaxCountry {
+
+    @Schema(description = "税务国家")
+    private String taxCountry;
+
+    @Schema(description = "税务编号")
+    private String taxNumber;
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/Customer.java

@@ -141,6 +141,11 @@ public class Customer implements Serializable {
      */
     private String idCard;
 
+     /**
+     * 身份证地址
+     */
+    private String idCardAddress;
+
     /**
      * 护照号
      */

yd-csf-service/src/main/java/com/yd/csf/service/model/CustomerExpand.java

@@ -4,22 +4,23 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.yd.csf.service.vo.AddressVO;
 import lombok.Data;
 
 /**
  * CSF客户信息扩展表
+ *
  * @TableName customer_expand
  */
-@TableName(value ="customer_expand")
+@TableName(value = "customer_expand")
 @Data
 public class CustomerExpand implements Serializable {
     /**
-     * 
+     *
      */
     @TableId(type = IdType.AUTO)
     private Long id;
@@ -37,7 +38,7 @@ public class CustomerExpand implements Serializable {
     /**
      * 客户类型
      */
-    private String customerType;
+    private Object customerType;
 
     /**
      * 居住地区代码
@@ -50,14 +51,34 @@ public class CustomerExpand implements Serializable {
     private String residenceTelephone;
 
     /**
-     * 是否长期出国
+     * 是否长期出国 0-否 1-是
+     */
+    private Object longtimeAbroad;
+
+    /**
+     * 地址列表
+     */
+    private Object addressList;
+
+    /**
+     * 居住地址
+     */
+    private Object residenceAddress;
+
+    /**
+     * 住宅地址
+     */
+    private Object residentialAddress;
+
+    /**
+     * 邮寄地址
      */
-    private String longtimeAbroad;
+    private Object mailingAddress;
 
     /**
-     * 地址信息
+     * 公司地址
      */
-    private String addressList;
+    private Object companyAddress;
 
     /**
      * 公司名称
@@ -70,6 +91,11 @@ public class CustomerExpand implements Serializable {
     private String companyAreaCode;
 
     /**
+     * 公司地区邮编
+     */
+    private String companyAddressPostcode;
+
+    /**
      * 公司电话
      */
     private String companyTelephone;

yd-csf-service/src/main/java/com/yd/csf/service/model/FnaForm.java

@@ -46,6 +46,11 @@ public class FnaForm implements Serializable {
      */
     private Object personalData;
 
+     /**
+     * 税务国家列表
+     */
+    private Object taxList;
+
     /**
      * 家庭状况
      */

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CustomerServiceImpl.java

@@ -29,6 +29,7 @@ import com.yd.csf.service.vo.AddressVO;
 import com.yd.csf.service.vo.CustomerExpandVO;
 import com.yd.csf.service.vo.CustomerVO;
 import com.yd.csf.service.vo.FnaVO;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -70,8 +71,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         if (customerExpand != null) {
             BeanUtils.copyProperties(customerExpand, customerVO);
 
-            if (StringUtils.isNotBlank(customerExpand.getAddressList())) {
-                List<AddressVO> addressList = GSON.fromJson(customerExpand.getAddressList(), new TypeToken<List<AddressVO>>() {
+            if (ObjectUtils.isNotEmpty(customerExpand.getAddressList())) {
+                List<AddressVO> addressList = GSON.fromJson((String) customerExpand.getAddressList(), new TypeToken<List<AddressVO>>() {
                 }.getType());
                 customerVO.setAddressList(addressList);
             }
@@ -132,8 +133,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
             if (customerExpand != null) {
                 BeanUtils.copyProperties(customerExpand, customerVO);
 
-                if ( StringUtils.isNotBlank(customerExpand.getAddressList())) {
-                    List<AddressVO> addressList = GSON.fromJson(customerExpand.getAddressList(), new TypeToken<List<AddressVO>>() {
+                if (ObjectUtils.isNotEmpty(customerExpand.getAddressList())) {
+                    List<AddressVO> addressList = GSON.fromJson((String) customerExpand.getAddressList(), new TypeToken<List<AddressVO>>() {
                     }.getType());
                     customerVO.setAddressList(addressList);
                 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaFormServiceImpl.java

@@ -109,6 +109,11 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
         if (personalData != null) {
             fnaFormVO.setPersonalData(GSON.fromJson(personalData.toString(), PersonalData.class));
         }
+        Object taxList = fnaForm.getTaxList();
+        if (taxList != null) {
+            fnaFormVO.setTaxList(GSON.fromJson(taxList.toString(), new TypeToken<List<TaxCountry>>() {
+            }.getType()));
+        }
         Object familyMembers = fnaForm.getFamilyMembers();
         if (familyMembers != null) {
             fnaFormVO.setFamilyMembers(GSON.fromJson(familyMembers.toString(), new TypeToken<List<FamilyMember>>() {
@@ -208,6 +213,7 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
 
         fnaForm.setCustomerBizId(fnaFormAddRequest.getCustomerBizId());
         fnaForm.setPersonalData(GSON.toJson(fnaFormAddRequest.getPersonalData()));
+        fnaForm.setTaxList(GSON.toJson(fnaFormAddRequest.getTaxList()));
         fnaForm.setFamilyMembers(GSON.toJson(fnaFormAddRequest.getFamilyMembers()));
         fnaForm.setExistingSecurityOwner(GSON.toJson(fnaFormAddRequest.getExistingSecurityOwner()));
         fnaForm.setExistingSecurityInsured(GSON.toJson(fnaFormAddRequest.getExistingSecurityInsured()));
@@ -227,6 +233,7 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
         BeanUtils.copyProperties(fnaFormUpdateRequest, fnaForm);
 
         fnaForm.setPersonalData(GSON.toJson(fnaFormUpdateRequest.getPersonalData()));
+        fnaForm.setTaxList(GSON.toJson(fnaFormUpdateRequest.getTaxList()));
         fnaForm.setFamilyMembers(GSON.toJson(fnaFormUpdateRequest.getFamilyMembers()));
         fnaForm.setExistingSecurityOwner(GSON.toJson(fnaFormUpdateRequest.getExistingSecurityOwner()));
         fnaForm.setExistingSecurityInsured(GSON.toJson(fnaFormUpdateRequest.getExistingSecurityInsured()));

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java

@@ -359,6 +359,10 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
     @Override
     public String getNextStatus(PolicyFollowStatusEnum policyFollowStatusEnum) {
         switch (policyFollowStatusEnum) {
+            case FOLLOW_UP:
+                return PolicyFollowStatusEnum.CHECKING.getItemValue() + ","
+                        + PolicyFollowStatusEnum.DECLINED.getItemValue() + ","
+                        + PolicyFollowStatusEnum.CANCELLED.getItemValue();
             case CHECKING:
                 return PolicyFollowStatusEnum.UNDERWRITING.getItemValue() + ","
                         + PolicyFollowStatusEnum.CANCELLED.getItemValue();

yd-csf-service/src/main/java/com/yd/csf/service/vo/FnaFormVO.java

@@ -43,6 +43,12 @@ public class FnaFormVO implements Serializable {
     @Schema(description = "个人资料")
     private PersonalData personalData;
 
+     /**
+     * 税务国家列表
+     */
+    @Schema(description = "税务国家列表")
+    private List<TaxCountry> taxList;
+
     /**
      * 家庭状况
      */

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

@@ -5,33 +5,36 @@
 <mapper namespace="com.yd.csf.service.dao.CustomerExpandMapper">
 
     <resultMap id="BaseResultMap" type="com.yd.csf.service.model.CustomerExpand">
-            <id property="id" column="id" />
-            <result property="customerExpandBizId" column="customer_expand_biz_id" />
-            <result property="customerBizId" column="customer_biz_id" />
-            <result property="customerType" column="customer_type" />
-            <result property="residenceAreaCode" column="residence_area_code" />
-            <result property="residenceTelephone" column="residence_telephone" />
-            <result property="longtimeAbroad" column="longtime_abroad" />
-            <result property="residenceAddress" column="residence_address" />
-            <result property="residentialAddress" column="residential_address" />
-            <result property="mailingAddress" column="mailing_address" />
-            <result property="companyAddress" column="company_address" />
-            <result property="companyName" column="company_name" />
-            <result property="companyAreaCode" column="company_area_code" />
-            <result property="companyTelephone" column="company_telephone" />
-            <result property="position" column="position" />
-            <result property="workYear" column="work_year" />
-            <result property="salary" column="salary" />
-            <result property="remark" column="remark" />
-            <result property="isDeleted" column="is_deleted" />
-            <result property="creatorId" column="creator_id" />
-            <result property="updaterId" column="updater_id" />
-            <result property="createTime" column="create_time" />
-            <result property="updateTime" column="update_time" />
+        <id property="id" column="id"/>
+        <result property="customerExpandBizId" column="customer_expand_biz_id"/>
+        <result property="customerBizId" column="customer_biz_id"/>
+        <result property="customerType" column="customer_type"/>
+        <result property="residenceAreaCode" column="residence_area_code"/>
+        <result property="residenceTelephone" column="residence_telephone"/>
+        <result property="longtimeAbroad" column="longtime_abroad"/>
+        <result property="addressList" column="address_list"/>
+        <result property="residenceAddress" column="residence_address"/>
+        <result property="residentialAddress" column="residential_address"/>
+        <result property="mailingAddress" column="mailing_address"/>
+        <result property="companyAddress" column="company_address"/>
+        <result property="companyName" column="company_name"/>
+        <result property="companyAreaCode" column="company_area_code"/>
+        <result property="companyAddressPostcode" column="company_address_postcode"/>
+        <result property="companyTelephone" column="company_telephone"/>
+        <result property="position" column="position"/>
+        <result property="workYear" column="work_year"/>
+        <result property="salary" column="salary"/>
+        <result property="remark" column="remark"/>
+        <result property="isDeleted" column="is_deleted"/>
+        <result property="creatorId" column="creator_id"/>
+        <result property="updaterId" column="updater_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,customer_expand_biz_id,customer_biz_id,customer_type,residence_area_code,residence_telephone,
+        id
+        ,customer_expand_biz_id,customer_biz_id,customer_type,residence_area_code,residence_telephone,
         longtime_abroad,residence_address,residential_address,mailing_address,company_address,
         company_name,company_area_code,company_telephone,position,work_year,
         salary,remark,is_deleted,creator_id,updater_id,

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

@@ -29,6 +29,7 @@
             <result property="source" column="source" />
             <result property="idType" column="id_type" />
             <result property="idCard" column="id_card" />
+            <result property="idCardAddress" column="id_card_address" />
             <result property="passport" column="passport" />
             <result property="eepCode" column="eep_code" />
             <result property="marriage" column="marriage" />
@@ -49,7 +50,7 @@
         last_name_pinyin,first_name_pinyin,pinyin,title,gender,
         birthdate,abnormal,age,area_code,
         phone,email,smoke,smoke_quantity,company_type,fixed_phone,
-        source,id_type,id_card,passport,eep_code,
+        source,id_type,id_card,id_card_address,passport,eep_code,
         marriage,birthplace,education,customer_expand_biz_id,country,
         remark,is_deleted,creator_id,updater_id,create_time,
         update_time

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

@@ -11,6 +11,7 @@
             <result property="agentBizId" column="agent_biz_id" />
             <result property="customerBizId" column="customer_biz_id" />
             <result property="personalData" column="personal_data" />
+             <result property="taxList" column="tax_list" />
             <result property="familyMembers" column="family_members" />
             <result property="existingSecurityOwner" column="existing_security_owner" />
             <result property="existingSecurityInsured" column="existing_security_insured" />
@@ -30,7 +31,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,fna_form_biz_id,user_biz_id,agent_biz_id,customer_biz_id,personal_data,
+        id,fna_form_biz_id,user_biz_id,agent_biz_id,customer_biz_id,personal_data,tax_list,
         family_members,existing_security_owner,existing_security_insured,income_expense,liquid_assets,
         primary_residence,investment,company_business_data,other,fna_form_status,
         remark,is_deleted,creator_id,updater_id,create_time,