Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoiceReceivableExportExcelVo.java

@@ -105,6 +105,14 @@ public class InvoiceReceivableExportExcelVo extends BaseModel  {
     @ExcelProperty(value = "公司编码", index = 17)
     private String companyId;
 
+    @Schema(description = "对接人")
+    @ExcelProperty(value = "对接人", index = 18)
+    private String contactPerson;
+
+    @Schema(description = "对接人手机号")
+    @ExcelProperty(value = "对接人手机号", index = 19)
+    private String contactPersonPhone;
+
     @Schema(description = "错误信息")
     @ExcelIgnore
     private String errorMessage;
@@ -149,6 +157,14 @@ public class InvoiceReceivableExportExcelVo extends BaseModel  {
             resultVo.setMessage("协议类型不能为空");
             return resultVo;
         }
+        if (StrUtil.isBlank(this.getContactPerson())) {
+            resultVo.setMessage("对接人不能为空");
+            return resultVo;
+        }
+        if (StrUtil.isBlank(this.getAgreementType())) {
+            resultVo.setMessage("对接人手机号不能为空");
+            return resultVo;
+        }
 
         // 交强险：有保单号 → 手续费、跟单费必填
         if (StrUtil.isNotBlank(this.getJqPolicyNo())

commons/src/main/java/com/jzg/commons/entity/finance/vo/JyExcelVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.finance.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -37,6 +38,15 @@ public class JyExcelVo {
     @Schema(description = "驾意险跟单费比例")
     private BigDecimal jyOtherRatio;
 
+    @Schema(description = "对接人")
+    @ExcelProperty(value = "对接人")
+    private String contactPerson;
+
+    @Schema(description = "对接人手机号")
+    @ExcelProperty(value = "对接人手机号")
+    private String contactPersonPhone;
+
+
     @Schema(description = "错误信息")
     private String errorMessage;
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/OtherExcelVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.finance.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -43,6 +44,15 @@ public class OtherExcelVo {
     @Schema(description = "商业险跟单费比例")
     private BigDecimal syOtherRatio;
 
+    @Schema(description = "对接人")
+    @ExcelProperty(value = "对接人")
+    private String contactPerson;
+
+    @Schema(description = "对接人手机号")
+    @ExcelProperty(value = "对接人手机号")
+    private String contactPersonPhone;
+
+
     @Schema(description = "错误信息")
     private String errorMessage;
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableExportExcelVo.java

@@ -139,6 +139,10 @@ public class ReceivableExportExcelVo {
     @ExcelProperty(value = "产品名称", index = 24)
     private String productName;
 
+    @Schema(description = "对接人手机号")
+    @ExcelProperty(value = "对接人手机号", index = 25)
+    private String dockingPersonPhone;
+
     @Schema(description = "错误信息")
     private String errorMessage;
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/SuperviseExcelVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.finance.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -43,6 +44,14 @@ public class SuperviseExcelVo {
     @Schema(description = "商业险手续费比例")
     private BigDecimal sySuperviseRatio;
 
+    @Schema(description = "对接人")
+    @ExcelProperty(value = "对接人")
+    private String contactPerson;
+
+    @Schema(description = "对接人手机号")
+    @ExcelProperty(value = "对接人手机号")
+    private String contactPersonPhone;
+
     @Schema(description = "错误信息")
     private String errorMessage;
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1081,6 +1081,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             insPlyIncome.setJySuperviseCostsProportion(vo.getJySuperviseCostsProportion());
             insPlyIncome.setJyOtherCostsProportion(vo.getJyOtherCostsProportion());
             insPlyIncome.setContactPerson(vo.getDockingPerson());
+            insPlyIncome.setContactPersonPhone(vo.getDockingPersonPhone());
 
             // 加入修改列表
             updateExcel.add(insPlyIncome);
@@ -1230,6 +1231,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             insPlyIncome.setProductName(vo.getProductName());
             // 被保险人姓名
             insPlyIncome.setInsuredPerson(vo.getInsuredPerson());
+            // 对接人信息
+            insPlyIncome.setContactPerson(vo.getContactPerson());
+            insPlyIncome.setContactPersonPhone(vo.getContactPersonPhone());
 
             // 数据库不存在 → 直接失败
             if (Objects.isNull(existIncome)) {
@@ -1513,6 +1517,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             insPlyIncome.setJqPolicyNo(vo.getJqPolicyNo());
             insPlyIncome.setJqPremium(vo.getJqPremium().toString());
             insPlyIncome.setJqSuperviseCostsProportion(vo.getJqSuperviseRatio().toString());
+            insPlyIncome.setContactPerson(vo.getContactPerson());
+            insPlyIncome.setContactPersonPhone(vo.getContactPersonPhone());
             successExcel.add(insPlyIncome);
         }
 
@@ -1606,6 +1612,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             insPlyIncome.setJqPolicyNo(vo.getJqPolicyNo());
             insPlyIncome.setJqPremium(vo.getJqPremium().toString());
             insPlyIncome.setJqOtherCostsProportion(vo.getJqOtherRatio().toString());
+            insPlyIncome.setContactPerson(vo.getContactPerson());
+            insPlyIncome.setContactPersonPhone(vo.getContactPersonPhone());
             successExcel.add(insPlyIncome);
         }
 
@@ -1708,6 +1716,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             insPlyIncome.setJySuperviseCostsProportion(vo.getJySuperviseCostsProportion());
             insPlyIncome.setJyOtherCostsProportion(vo.getJyOtherCostsProportion());
             insPlyIncome.setContactPerson(vo.getDockingPerson());
+            insPlyIncome.setContactPersonPhone(vo.getDockingPersonPhone());
 
             // 加入修改列表
             updateExcel.add(insPlyIncome);
@@ -1818,6 +1827,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             insPlyIncome.setJyPremium(vo.getJyPremium().toString());
             insPlyIncome.setJySuperviseCostsProportion(vo.getJySuperviseRatio().toString());
             insPlyIncome.setJyOtherCostsProportion(vo.getJyOtherRatio().toString());
+            insPlyIncome.setContactPerson(vo.getContactPerson());
+            insPlyIncome.setContactPersonPhone(vo.getContactPersonPhone());
             successExcel.add(insPlyIncome);
         }