diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java index 620b2dd5b..63c442ea6 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java @@ -116,52 +116,6 @@ public class EmisCommissionDtlController extends BaseController List list = emisCommissionDtlService.selectCommissionDtlMapList(emisCommissionDtl); -// if(!CollectionUtils.isEmpty(list)) { -// // 数据压缩过滤 -// List 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); diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml index 33a286051..f1a5615e4 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml @@ -164,6 +164,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.update_time = #{updateTime} and a.create_site like concat('%', #{createSite}, '%') and a.update_site like concat('%', #{updateSite}, '%') + + + + and b.send_date = ]]> #{params.beginSendDate} + + + and b.send_date #{params.endSendDate} + + order by a.create_time desc @@ -199,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_time = #{updateTime} and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + order by create_time desc