diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java index 4e5a13823..9ee6df7b5 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java @@ -198,6 +198,17 @@ public class EmisCommissionProfitController extends BaseController { startPage(); List 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); } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml index ab85bc8ba..b9d3cbd1f 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.bill_code=b.bill_code and a.del_flag='0' and b.del_flag='0' 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) ) and b.id = #{id} and ( FIND_IN_SET(b.`bill_code`,#{billCode}) )