增加-AGMS寿险经纪人发佣关账报表，添加FYC字段

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java

@@ -853,7 +853,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
 
 
     private void createCSV(List<FortunePayToOrderInfo> fortunePayToOrderInfos, HttpServletResponse response) {
     private void createCSV(List<FortunePayToOrderInfo> fortunePayToOrderInfos, HttpServletResponse response) {
         String charset = "UTF-8"; // 读取字符编码
         String charset = "UTF-8"; // 读取字符编码
-        String[] columnName = new String[]{"序号","预计发佣年月","经纪人","佣金","应发佣金","保单号","保费","佣金率","发佣状态","佣金类型","手机号","职级","分公司","营业部","体系","购买方案"};
+        String[] columnName = new String[]{"序号","预计发佣年月","经纪人","佣金","应发佣金","首年销售佣金(fyc)","保单号","保费","佣金率","发佣状态","佣金类型","手机号","职级","分公司","营业部","体系","购买方案"};
         String tableName = "YD_Export_Fortune_Pay";
         String tableName = "YD_Export_Fortune_Pay";
         String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
         String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
         String CSV_ROW_SEPARATOR = "\r\n";//CSV文件行分隔符
         String CSV_ROW_SEPARATOR = "\r\n";//CSV文件行分隔符
@@ -873,6 +873,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
                 buf.append(info.getPractitionerName()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getPractitionerName()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getCommissionAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getCommissionAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getReferralAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getReferralAmount()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getFycAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append("P_").append(info.getPolicyNo()).append(CSV_COLUMN_SEPARATOR);
                 buf.append("P_").append(info.getPolicyNo()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getOrderPrice()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getOrderPrice()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getCommissionRate()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getCommissionRate()).append(CSV_COLUMN_SEPARATOR);

yd-api/src/main/java/com/yd/dal/entity/agms/fortune/FortunePayToOrderInfo.java

@@ -7,7 +7,6 @@ import java.math.BigDecimal;
 /**
 /**
  * @author xxy
  * @author xxy
  */
  */
-@Data
 public class FortunePayToOrderInfo {
 public class FortunePayToOrderInfo {
     /**
     /**
      * 保险公司
      * 保险公司
@@ -93,5 +92,359 @@ public class FortunePayToOrderInfo {
      * 体系
      * 体系
      */
      */
     private String subordinateSystemName;
     private String subordinateSystemName;
+
+    /**
+     * fyc
+     */
+    private BigDecimal fycAmount;
+
+
+    /**
+     * 获取 保险公司
+     *
+     * @return the insurerName 保险公司
+     */
+    public String getInsurerName() {
+        return this.insurerName;
+    }
+
+    /**
+     * 设置 保险公司
+     *
+     * @param insurerName the 保险公司 to set
+     */
+    public void setInsurerName(String insurerName) {
+        this.insurerName = insurerName;
+    }
+
+    /**
+     * 获取 保单号
+     *
+     * @return the policyNo 保单号
+     */
+    public String getPolicyNo() {
+        return this.policyNo;
+    }
+
+    /**
+     * 设置 保单号
+     *
+     * @param policyNo the 保单号 to set
+     */
+    public void setPolicyNo(String policyNo) {
+        this.policyNo = policyNo;
+    }
+
+    /**
+     * 获取 保费
+     *
+     * @return the orderPrice 保费
+     */
+    public BigDecimal getOrderPrice() {
+        return this.orderPrice;
+    }
+
+    /**
+     * 设置 保费
+     *
+     * @param orderPrice the 保费 to set
+     */
+    public void setOrderPrice(BigDecimal orderPrice) {
+        this.orderPrice = orderPrice;
+    }
+
+    /**
+     * 获取 佣金类型
+     *
+     * @return the commissionType 佣金类型
+     */
+    public String getCommissionType() {
+        return this.commissionType;
+    }
+
+    /**
+     * 设置 佣金类型
+     *
+     * @param commissionType the 佣金类型 to set
+     */
+    public void setCommissionType(String commissionType) {
+        this.commissionType = commissionType;
+    }
+
+    /**
+     * 获取 应发佣率
+     *
+     * @return the referralRate 应发佣率
+     */
+    public BigDecimal getReferralRate() {
+        return this.referralRate;
+    }
+
+    /**
+     * 设置 应发佣率
+     *
+     * @param referralRate the 应发佣率 to set
+     */
+    public void setReferralRate(BigDecimal referralRate) {
+        this.referralRate = referralRate;
+    }
+
+    /**
+     * 获取 应发金额
+     *
+     * @return the referralAmount 应发金额
+     */
+    public BigDecimal getReferralAmount() {
+        return this.referralAmount;
+    }
+
+    /**
+     * 设置 应发金额
+     *
+     * @param referralAmount the 应发金额 to set
+     */
+    public void setReferralAmount(BigDecimal referralAmount) {
+        this.referralAmount = referralAmount;
+    }
+
+    /**
+     * 获取 购买方案
+     *
+     * @return the productName 购买方案
+     */
+    public String getProductName() {
+        return this.productName;
+    }
+
+    /**
+     * 设置 购买方案
+     *
+     * @param productName the 购买方案 to set
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取 预计发佣年月
+     *
+     * @return the payoutYearmonth 预计发佣年月
+     */
+    public String getPayoutYearmonth() {
+        return this.payoutYearmonth;
+    }
+
+    /**
+     * 设置 预计发佣年月
+     *
+     * @param payoutYearmonth the 预计发佣年月 to set
+     */
+    public void setPayoutYearmonth(String payoutYearmonth) {
+        this.payoutYearmonth = payoutYearmonth;
+    }
+
+    /**
+     * 获取 经纪人
+     *
+     * @return the practitionerName 经纪人
+     */
+    public String getPractitionerName() {
+        return this.practitionerName;
+    }
+
+    /**
+     * 设置 经纪人
+     *
+     * @param practitionerName the 经纪人 to set
+     */
+    public void setPractitionerName(String practitionerName) {
+        this.practitionerName = practitionerName;
+    }
+
+    /**
+     * 获取 佣金
+     *
+     * @return the commissionAmount 佣金
+     */
+    public BigDecimal getCommissionAmount() {
+        return this.commissionAmount;
+    }
+
+    /**
+     * 设置 佣金
+     *
+     * @param commissionAmount the 佣金 to set
+     */
+    public void setCommissionAmount(BigDecimal commissionAmount) {
+        this.commissionAmount = commissionAmount;
+    }
+
+    /**
+     * 获取 佣金率
+     *
+     * @return the commissionRate 佣金率
+     */
+    public BigDecimal getCommissionRate() {
+        return this.commissionRate;
+    }
+
+    /**
+     * 设置 佣金率
+     *
+     * @param commissionRate the 佣金率 to set
+     */
+    public void setCommissionRate(BigDecimal commissionRate) {
+        this.commissionRate = commissionRate;
+    }
+
+    /**
+     * 获取 发佣状态
+     *
+     * @return the commissionPayoutStatus 发佣状态
+     */
+    public String getCommissionPayoutStatus() {
+        return this.commissionPayoutStatus;
+    }
+
+    /**
+     * 设置 发佣状态
+     *
+     * @param commissionPayoutStatus the 发佣状态 to set
+     */
+    public void setCommissionPayoutStatus(String commissionPayoutStatus) {
+        this.commissionPayoutStatus = commissionPayoutStatus;
+    }
+
+    /**
+     * 获取 手机号
+     *
+     * @return the mobileNo 手机号
+     */
+    public String getMobileNo() {
+        return this.mobileNo;
+    }
+
+    /**
+     * 设置 手机号
+     *
+     * @param mobileNo the 手机号 to set
+     */
+    public void setMobileNo(String mobileNo) {
+        this.mobileNo = mobileNo;
+    }
+
+    /**
+     * 获取 经纪人职级
+     *
+     * @return the practitionerLevel 经纪人职级
+     */
+    public String getPractitionerLevel() {
+        return this.practitionerLevel;
+    }
+
+    /**
+     * 设置 经纪人职级
+     *
+     * @param practitionerLevel the 经纪人职级 to set
+     */
+    public void setPractitionerLevel(String practitionerLevel) {
+        this.practitionerLevel = practitionerLevel;
+    }
+
+    /**
+     * 获取 分公司
+     *
+     * @return the insurerBranchName 分公司
+     */
+    public String getInsurerBranchName() {
+        return this.insurerBranchName;
+    }
+
+    /**
+     * 设置 分公司
+     *
+     * @param insurerBranchName the 分公司 to set
+     */
+    public void setInsurerBranchName(String insurerBranchName) {
+        this.insurerBranchName = insurerBranchName;
+    }
+
+    /**
+     * 获取 营业部
+     *
+     * @return the insurerBranchDeptName 营业部
+     */
+    public String getInsurerBranchDeptName() {
+        return this.insurerBranchDeptName;
+    }
+
+    /**
+     * 设置 营业部
+     *
+     * @param insurerBranchDeptName the 营业部 to set
+     */
+    public void setInsurerBranchDeptName(String insurerBranchDeptName) {
+        this.insurerBranchDeptName = insurerBranchDeptName;
+    }
+
+    /**
+     * 获取 体系
+     *
+     * @return the subordinateSystemName 体系
+     */
+    public String getSubordinateSystemName() {
+        return this.subordinateSystemName;
+    }
+
+    /**
+     * 设置 体系
+     *
+     * @param subordinateSystemName the 体系 to set
+     */
+    public void setSubordinateSystemName(String subordinateSystemName) {
+        this.subordinateSystemName = subordinateSystemName;
+    }
+
+    /**
+     * 获取 fyc
+     *
+     * @return the fycAmount fyc
+     */
+    public BigDecimal getFycAmount() {
+        return this.fycAmount;
+    }
+
+    /**
+     * 设置 fyc
+     *
+     * @param fycAmount the fyc to set
+     */
+    public void setFycAmount(BigDecimal fycAmount) {
+        this.fycAmount = fycAmount;
+    }
+
+    @Override
+    public String toString() {
+        return "FortunePayToOrderInfo{" +
+                "insurerName='" + insurerName + '\'' +
+                ", policyNo='" + policyNo + '\'' +
+                ", orderPrice=" + orderPrice +
+                ", commissionType='" + commissionType + '\'' +
+                ", referralRate=" + referralRate +
+                ", referralAmount=" + referralAmount +
+                ", productName='" + productName + '\'' +
+                ", payoutYearmonth='" + payoutYearmonth + '\'' +
+                ", practitionerName='" + practitionerName + '\'' +
+                ", commissionAmount=" + commissionAmount +
+                ", commissionRate=" + commissionRate +
+                ", commissionPayoutStatus='" + commissionPayoutStatus + '\'' +
+                ", mobileNo='" + mobileNo + '\'' +
+                ", practitionerLevel='" + practitionerLevel + '\'' +
+                ", insurerBranchName='" + insurerBranchName + '\'' +
+                ", insurerBranchDeptName='" + insurerBranchDeptName + '\'' +
+                ", subordinateSystemName='" + subordinateSystemName + '\'' +
+                ", fycAmount=" + fycAmount +
+                '}';
+    }
 }
 }
 
 

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -109,7 +109,8 @@
                f.practitioner_level                    practitionerLevel,
                f.practitioner_level                    practitionerLevel,
                dept.name                               insurerBranchDeptName,
                dept.name                               insurerBranchDeptName,
                sub.name                                subordinateSystemName,
                sub.name                                subordinateSystemName,
-               ib.branch_name                          insurerBranchName
+               ib.branch_name                          insurerBranchName,
+               f.fyc_amount                            fycAmount
         from ag_acl_customer_fortune f
         from ag_acl_customer_fortune f
                      left join ag_po_order o
                      left join ag_po_order o
                      left join ag_product_plan pp on pp.id = o.plan_id
                      left join ag_product_plan pp on pp.id = o.plan_id