diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 709e9806b..da36c9d61 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -339,6 +339,40 @@ public class EmisSettleBillController extends BaseController return getDataTable(list); } + /** + * 销售回款率统计 + * @param emisSettleBill + * @return + */ + @GetMapping("/querySalesPayBackRateList") + public TableDataInfo querySalesPayBackRateList(EmisSettleBill emisSettleBill) + { + startPage(); + + setPrivParams(emisSettleBill); + + String billCodeStr = MapUtil.getStr(emisSettleBill.getParams(),"billCode"); + if(!StringUtils.isEmpty(billCodeStr)){ + emisSettleBill.getParams().put("billCode",WaybillHelper.formatQueryValue(billCodeStr)); + String[] billCodeSortList = billCodeStr.split(","); + if(billCodeSortList.length>1){ + emisSettleBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + } + + + if(!StringUtils.isEmpty(emisSettleBill.getSettleBillNo())){ + emisSettleBill.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleBill.getSettleBillNo())); + String[] settleBillNoSortList = emisSettleBill.getSettleBillNo().split(","); + if(settleBillNoSortList.length>1){ + emisSettleBill.getParams().put("settleBillNoSortList",Arrays.asList(settleBillNoSortList)); + } + } + + List list = emisSettleBillService.querySalesPayBackRateList(emisSettleBill); + return getDataTable(list); + } + /** * 新增运单总账单 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java index cf69129ee..ac1944105 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java @@ -56,6 +56,13 @@ public interface EmisSettleBillMapper extends BaseMapper */ public List queryPayBackStatList(EmisSettleBill emisSettleBill); + /** + * 销售回款率统计 + * @param emisSettleBill + * @return + */ + public List querySalesPayBackRateList(EmisSettleBill emisSettleBill); + public List selectOpenBillStatInfoList(EmisSettleBill emisSettleBill); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java index a9def5c71..b929bb210 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java @@ -54,6 +54,14 @@ public interface IEmisSettleBillService extends IDataAuditService */ public List queryPayBackStatList(EmisSettleBill emisSettleBill); + + /** + * 销售回款率统计 + * @param emisSettleBill + * @return + */ + public List querySalesPayBackRateList(EmisSettleBill emisSettleBill); + /** * 获取开票统计数据 * @param emisSettleBill diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index f38976d5c..af144ad6d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -128,6 +128,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS return emisSettleBillMapper.queryPayBackStatList(emisSettleBill); } + @Override + public List querySalesPayBackRateList(EmisSettleBill emisSettleBill) + { + return emisSettleBillMapper.querySalesPayBackRateList(emisSettleBill); + } + /** * 获取开票统计数据 * @param emisSettleBill diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 417c7f556..6f62c3eb5 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -634,7 +634,254 @@ + + select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, invoiced_money, cust_no, cust_name, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, payee, salesmen, credit_period, credit_period_type, settle_day, payment_due_date, bl_send_oms, 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_settle_bill a