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-14 14:22:08 +08:00
parent ae783ac894
commit c4bc4266a3
2 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
View File

@ -116,52 +116,6 @@ public class EmisCommissionDtlController extends BaseController
List<Map> list = emisCommissionDtlService.selectCommissionDtlMapList(emisCommissionDtl);
// if(!CollectionUtils.isEmpty(list)) {
// // 数据压缩过滤
// List<JSONObject> expList = new ArrayList<>();
// for (EmisCommissionDtl item:list) {
// JSONObject objItem = new JSONObject();
//
// objItem.putOpt("id",item.getId());
// objItem.putOpt("feeType",item.getFeeType());
// objItem.putOpt("money",item.getMoney());
// objItem.putOpt("billMonth",item.getBillMonth());
// objItem.putOpt("billType",item.getBillType());
// objItem.putOpt("billCode",item.getBillCode());
// objItem.putOpt("quoteId",item.getQuoteId());
// objItem.putOpt("quoteName",item.getQuoteName());
// objItem.putOpt("exprId",item.getExprId());
// objItem.putOpt("calcExpr",item.getCalcExpr());
// objItem.putOpt("feeRemark",item.getFeeRemark());
// objItem.putOpt("empCode",item.getEmpCode());
// objItem.putOpt("empName",item.getEmpName());
// objItem.putOpt("createTime",item.getCreateTime());
//
// EmisWaybill emisItem=item.getWaybillDetail();
// JSONObject objWaybillItem= new JSONObject();
// objWaybillItem.putOpt("sendSiteName",emisItem.getSendSiteName());
// objWaybillItem.putOpt("dispatchUnderlingSiteName",emisItem.getSendSiteName());
// objWaybillItem.putOpt("sendSiteName",emisItem.getSendSiteName());
// objWaybillItem.putOpt("sendSiteName",emisItem.getSendSiteName());
// objWaybillItem.putOpt("sendSiteName",emisItem.getSendSiteName());
//
// // "waybillDetail.sendSiteName","waybillDetail.dispatchUnderlingSiteName"
//// ,"waybillDetail.sendCountryName","waybillDetail.receiveCountryName"
//// ,"waybillDetail.paymentType","waybillDetail.sendDate"
//// ,"waybillDetail.sendCompany","waybillDetail.transLineTypeName"
//// ,"waybillDetail.productTypeName","waybillDetail.timeType"
//// ,"waybillDetail.sendName","waybillDetail.parcelQty"
//// ,"waybillDetail.billWeight","waybillDetail.totalVolume"
//// ,"waybillDetail.volumeWeight","waybillDetail.settlementWeight"
//// ,"waybillDetail.billFee","waybillDetail.realFee"
//// ,"waybillDetail.freight","waybillDetail.paymentStatus"
//// ,"waybillDetail.feeRemark","waybillDetail.remark"
//// ,"waybillDetail.payee","waybillDetail.salesmen"
//
//
//
// }
// }
return getDataTable(list);

10
emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml
View File

@ -164,6 +164,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null "> and a.update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and a.create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and a.update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''">
and b.send_date <![CDATA[ >= ]]> #{params.beginSendDate}
</if>
<if test="params.endSendDate != null and params.endSendDate != ''">
and b.send_date <![CDATA[ <= ]]> #{params.endSendDate}
</if>
</where>
order by a.create_time desc
</select>
@ -199,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
</where>
order by create_time desc
</select>