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

Merge pull request 'demand: TMS系统 - 提成管理 - 提成统计 - 设置现金提成、月结提成的提成金额小数点保留2位数且四舍五入 tms-提成管理-运单利润统计-剔除问题件类型为进口/返货虚拟单的运单' (#327) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/327
This commit is contained in:
heyu 2026-03-14 13:31:54 +08:00
commit 898149fcf4
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
View File

@ -198,6 +198,17 @@ public class EmisCommissionProfitController extends BaseController
{ {
startPage(); startPage();
List<EmisCommissionProfit> list = emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit); List<EmisCommissionProfit> list = emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit);
// 金额类字段统一四舍五入保留两位小数
if (list != null && !list.isEmpty()) {
for (EmisCommissionProfit item : list) {
if (item.getMoney() != null) {
item.setMoney(item.getMoney().setScale(2, BigDecimal.ROUND_HALF_UP));
}
if (item.getMonthMoney() != null) {
item.setMonthMoney(item.getMonthMoney().setScale(2, BigDecimal.ROUND_HALF_UP));
}
}
}
return getDataTable(list); return getDataTable(list);
} }

2
emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
View File

@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
a.bill_code=b.bill_code and a.del_flag='0' and b.del_flag='0' a.bill_code=b.bill_code and a.del_flag='0' and b.del_flag='0'
and not EXISTS ( and not EXISTS (
select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and ewpi.`problem_type` in(151) select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and ewpi.`problem_type` in(151,170,173)
) )
<if test="id != null "> and b.id = #{id}</if> <if test="id != null "> and b.id = #{id}</if>
<if test="billCode != null and billCode != ''">and ( FIND_IN_SET(b.`bill_code`,#{billCode}) )</if> <if test="billCode != null and billCode != ''">and ( FIND_IN_SET(b.`bill_code`,#{billCode}) )</if>