aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-05-13 19:21:09 +08:00
parent 58bee0de44
commit 9981d13642
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
View File

@ -46,8 +46,10 @@ public class EmisCommissionProfit extends BaseEntity
private String empName; private String empName;
/* 月份 202402 */ /* 月份 202402 */
private String billMonth; private String billMonth;
/* 预估提成金额 */ /* 预估提成金额--现金 */
private BigDecimal money; private BigDecimal money;
// 月结金额
private BigDecimal monthMoney;
/* 实际提成金额 */ /* 实际提成金额 */
private BigDecimal realMoney; private BigDecimal realMoney;
/* 已发放金额 */ /* 已发放金额 */
@ -75,4 +77,7 @@ public class EmisCommissionProfit extends BaseEntity
/* 确认网点代码 */ /* 确认网点代码 */
private String confirmSiteCode; private String confirmSiteCode;
/* 结算类型 1-现金 2-月结 */
private String settleType;
} }

11
emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
View File

@ -12,6 +12,7 @@
<result property="billMonth" column="bill_month" /> <result property="billMonth" column="bill_month" />
<result property="money" column="money" /> <result property="money" column="money" />
<result property="realMoney" column="real_money" /> <result property="realMoney" column="real_money" />
<result property="monthMoney" column="month_money" />
<result property="payedMoney" column="payed_money" /> <result property="payedMoney" column="payed_money" />
<result property="blConfirmCenter" column="bl_confirm_center" /> <result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" /> <result property="confirmCenterDate" column="confirm_center_date" />
@ -26,13 +27,15 @@
</resultMap> </resultMap>
<sql id="selectEmisCommissionProfitVo"> <sql id="selectEmisCommissionProfitVo">
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
</sql> </sql>
<select id="selectProfitStatList" parameterType="String" resultMap="EmisCommissionProfitResult"> <select id="selectProfitStatList" parameterType="String" resultMap="EmisCommissionProfitResult">
select emp_name ,bill_month, sum(money) as money select emp_name ,bill_month,
from emis_commission_dtl a sum(if(b.payment_type in(1,3,6),money,0) ) as money,
where del_flag='0' sum(if(b.payment_type in(2,4,5),money,0) ) as month_money
from emis_commission_dtl a,emis_waybill b
where del_flag='0' and a.bill_code=b.bill_code
<if test="empName != null and empName != ''"> <if test="empName != null and empName != ''">
and a.emp_name = #{empName} and a.emp_name = #{empName}
</if> </if>