新单跟进v2

yd-csf-service/src/main/java/com/yd/csf/service/component/PolicyReportPdfService.java

 package com.yd.csf.service.component;
 
+import cn.hutool.core.util.NumberUtil;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
@@ -249,9 +250,9 @@ public class PolicyReportPdfService {
         addTableHeaderCellNoBorder(table, "保費徵費");
         addTableCellNoBorder(table, formatAmount(data.getPremiumFee()));
 
-        // 第六行：合預繳息金額 | 金額值 | (空) | (空)
-        addTableHeaderCellNoBorder(table, "合預繳息金額");
-        addTableCellNoBorder(table, formatAmount(data.getTotalPrepayment()));
+        // 第六行：首期合計金額 | 金額值 | (空) | (空)
+        addTableHeaderCellNoBorder(table, "首期合計金額");
+        addTableCellNoBorder(table, formatAmount(NumberUtil.add(data.getInitialPremium(), data.getPolicyLevy())));
         addTableCellNoBorder(table, "");
         addTableCellNoBorder(table, "");
 

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

@@ -25,6 +25,8 @@ public class PolicyReportData {
     private BigDecimal annualAmount;
     private BigDecimal totalPrepayment;
     private BigDecimal premiumFee;
+    private BigDecimal initialPremium;
+    private BigDecimal policyLevy;
 
     // 附加险信息
     private List<AdditionalInsurance> additionalInsurances;

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

@@ -631,14 +631,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         }
         // 处理附加险信息
         policyReportData.setAdditionalInsurances(additionalInsurances);
-        // 处理服务经理
-        String signerList = policyReportData.getServiceManager();
-        if (StringUtils.isNotBlank(signerList)) {
-            PolicySigner[] signers = GSONUtil.fromJson(signerList, PolicySigner[].class);
-            policyReportData.setServiceManager(signers[0].getSigner());
-        }
-        // 处理位置
-        policyReportData.setLocation("香港");
+
         return policyReportData;
     }
 

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

@@ -113,10 +113,13 @@
             t.each_issue_premium      as premiumFee,
             t.sign_date               as startTime,
             t.sign_date               as endTime,
-            t.signer_list             as serviceManager,
+            t.signer                  as serviceManager,
+            t.sign_location           as location,
             t.policy_holder           as policyHolder,
-            t.currency                as currency,
+            t.policy_currency         as currency,
             ifnull(i.name, i.name_en) as insuredPerson,
+            t.initial_premium         as initialPremium,
+            t.policy_levy             as policyLevy,
             i.age                     as insuredAge
 
         from policy_follow t