diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
index 6687d25f3..7eb935b36 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
@@ -46,8 +46,10 @@ public class EmisCommissionProfit extends BaseEntity
private String empName;
/* 月份 202402 */
private String billMonth;
- /* 预估提成金额 */
+ /* 预估提成金额--现金 */
private BigDecimal money;
+ // 月结金额
+ private BigDecimal monthMoney;
/* 实际提成金额 */
private BigDecimal realMoney;
/* 已发放金额 */
@@ -75,4 +77,7 @@ public class EmisCommissionProfit extends BaseEntity
/* 确认网点代码 */
private String confirmSiteCode;
+ /* 结算类型 1-现金 2-月结 */
+ private String settleType;
+
}
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
index d7022fd58..dad5d70d3 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
@@ -12,6 +12,7 @@
+
@@ -26,13 +27,15 @@
- select id, profit_no, emp_code, emp_name, bill_month, money, real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_profit
+ select id, profit_no, emp_code, emp_name, bill_month, money,month_money, real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_profit