push

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

@@ -120,8 +120,8 @@ public class CommissionExpectedAddDto {
     private String status;
     private String status;
 
 
     /**
     /**
-     * 备注
+     * 人工备注
      */
      */
-    @Schema(description = "备注")
-    private String remark;
+    @Schema(description = "人工备注")
+    private String manualRemark;
 }
 }

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

@@ -141,10 +141,10 @@ public class ReceivableReportVO {
     private String policyCurrency;
     private String policyCurrency;
 
 
     /**
     /**
-     * 备注
+     * 人工备注
      */
      */
-    @Schema(description = "备注")
-    private String remark;
+    @Schema(description = "人工备注")
+    private String manualRemark;
 
 
     /**
     /**
      * 保單持有人（投保人，保单表）（中文名）
      * 保單持有人（投保人，保单表）（中文名）

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

@@ -76,7 +76,7 @@
             (select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
             (select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
             (select pi.name from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insured,
             (select pi.name from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insured,
             (select pi.name_en from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insuredEn,
             (select pi.name_en from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insuredEn,
-            ce.remark,
+            ce.manual_remark as manualRemark,
             MAX(ce.reconciliation_company) as reconciliationCompany,
             MAX(ce.reconciliation_company) as reconciliationCompany,
             MAX(ce.reconciliation_company_biz_id) as reconciliationCompanyBizId,
             MAX(ce.reconciliation_company_biz_id) as reconciliationCompanyBizId,
             ce.commission_period as commissionPeriod,
             ce.commission_period as commissionPeriod,
@@ -122,7 +122,7 @@
             (select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
             (select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
             (select pi.name from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insured,
             (select pi.name from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insured,
             (select pi.name_en from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insuredEn,
             (select pi.name_en from policy_insurant pi where pi.policy_biz_id = p.policy_biz_id limit 1) as insuredEn,
-            ce.remark,
+            ce.manual_remark as manualRemark,
             ce.reconciliation_company as reconciliationCompany,
             ce.reconciliation_company as reconciliationCompany,
             ce.reconciliation_company_biz_id as reconciliationCompanyBizId,
             ce.reconciliation_company_biz_id as reconciliationCompanyBizId,
             ce.commission_period as commissionPeriod,
             ce.commission_period as commissionPeriod,