营销绩效表 表结构 up

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/report/domain/MarketingPerformance.java

@@ -381,6 +381,27 @@ public class MarketingPerformance extends TenantEntity {
      */
     private BigDecimal newHousingFundCustomerAmount;
 
+    /**
+     * 公积金缴存账户有效个数
+     */
+    private Long housingFundCustomerCount;
+
+    /**
+     * 公积金缴存账户奖励金额
+     */
+    private BigDecimal housingFundCustomerAmount;
+
+    /**
+     * 代收热力费有效个数
+     */
+    private Long heatFeeCollectionCount;
+
+    /**
+     * 代收热力奖励金额
+     */
+    private BigDecimal heatFeeCollectionAmount;
+
+
     /**
      * 附加项
      */

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/report/domain/bo/MarketingPerformanceBo.java

@@ -448,6 +448,30 @@ public class MarketingPerformanceBo extends BaseEntity {
     @NotNull(message = "新营销公积金缴存客户奖励金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal newHousingFundCustomerAmount;
 
+    /**
+     * 代收热力费有效个数
+     */
+    @NotNull(message = "代收热力费有效个数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long heatFeeCollectionCount;
+
+    /**
+     * 代收热力奖励金额
+     */
+    @NotNull(message = "代收热力奖励金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal heatFeeCollectionAmount;
+
+    /**
+     * 公积金缴存账户有效个数
+     */
+    @NotNull(message = "公积金缴存账户有效个数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long housingFundCustomerCount;
+
+    /**
+     * 公积金缴存账户奖励金额
+     */
+    @NotNull(message = "公积金缴存账户奖励金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal housingFundCustomerAmount;
+
     /**
      * 附加项
      */

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceExportVo.java

@@ -523,6 +523,34 @@ public class MarketingPerformanceExportVo implements Serializable {
     @ExcelProperty(value ={  "新营销公积金缴存客户", "奖励金额" }, index = 67)
     private BigDecimal newHousingFundCustomerAmount;
 
+
+    /**
+     * 公积金缴存账户有效个数
+     */
+//    @ExcelProperty(value = "公积金缴存账户有效个数")
+    @ExcelProperty(value ={  "公积金缴存账户", "有效个数" }, index = 68)
+    private Long housingFundCustomerCount;
+
+    /**
+     * 公积金缴存账户奖励金额
+     */
+//    @ExcelProperty(value = "公积金缴存账户奖励金额")
+    @ExcelProperty(value ={  "公积金缴存账户", "奖励金额" }, index = 69)
+    private BigDecimal housingFundCustomerAmount;
+
+    /**
+     * 代收热力费有效个数
+     */
+//    @ExcelProperty(value = "代收热力费有效个数")
+    @ExcelProperty(value ={  "代收热力费", "有效个数" }, index = 70 )
+    private Long heatFeeCollectionCount;
+
+    /**
+     * 代收热力奖励金额
+     */
+//    @ExcelProperty(value = "代收热力奖励金额")
+    @ExcelProperty(value ={  "代收热力费", "奖励金额" }, index = 71 )
+    private BigDecimal heatFeeCollectionAmount;
     /**
      * 附加项
      */

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceImportVo.java

@@ -458,6 +458,34 @@ public class MarketingPerformanceImportVo implements Serializable {
     @ExcelProperty(value = "新营销公积金缴存客户奖励金额")
     private BigDecimal newHousingFundCustomerAmount;
 
+    /**
+     * 公积金缴存账户有效个数
+     */
+    @ExcelProperty(value = "公积金缴存账户有效个数")
+//    @ExcelProperty(value ={  "公积金缴存账户", "有效个数" }, index = 68)
+    private Long housingFundCustomerCount;
+
+    /**
+     * 公积金缴存账户奖励金额
+     */
+    @ExcelProperty(value = "公积金缴存账户奖励金额")
+//    @ExcelProperty(value ={  "公积金缴存账户", "奖励金额" }, index = 69)
+    private BigDecimal housingFundCustomerAmount;
+
+    /**
+     * 代收热力费有效个数
+     */
+    @ExcelProperty(value = "代收热力费有效个数")
+//    @ExcelProperty(value ={  "代收热力费", "有效个数" }, index = 70 )
+    private Long heatFeeCollectionCount;
+
+    /**
+     * 代收热力奖励金额
+     */
+    @ExcelProperty(value = "代收热力奖励金额")
+//    @ExcelProperty(value ={  "代收热力费", "奖励金额" }, index = 71 )
+    private BigDecimal heatFeeCollectionAmount;
+
     /**
      * 附加项
      */

cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/resources/mapper/report/MarketingPerformanceMapper.xml

@@ -55,6 +55,8 @@
         huinong_buyer_amount,
         water_fee_collection_count,
         water_fee_collection_amount,
+        heat_fee_collection_count,
+        heat_fee_collection_amount,
         electricity_fee_collection_count,
         electricity_fee_collection_amount,
         traffic_fine_collection_count,
@@ -79,6 +81,8 @@
         fixed_term_wealth_amount,
         new_housing_fund_customer_count,
         new_housing_fund_customer_amount,
+        housing_fund_customer_count,
+        housing_fund_customer_amount,
         add_item,
         total_count,
         total_amount,
@@ -150,6 +154,8 @@
             #{item.huinongBuyerAmount},
             #{item.waterFeeCollectionCount},
             #{item.waterFeeCollectionAmount},
+            #{item.heatFeeCollectionCount},
+            #{item.heatFeeCollectionAmount},
             #{item.electricityFeeCollectionCount},
             #{item.electricityFeeCollectionAmount},
             #{item.trafficFineCollectionCount},
@@ -174,6 +180,8 @@
             #{item.fixedTermWealthAmount},
             #{item.newHousingFundCustomerCount},
             #{item.newHousingFundCustomerAmount},
+            #{item.housingFundCustomerCount},
+            #{item.housingFundCustomerAmount},
             #{item.addItem},
             #{item.totalCount},
             #{item.totalAmount},