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 a5414ac04..932c8f9f7 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 @@ -163,6 +163,37 @@ public class EmisSettleBillController extends BaseController return getDataTable(list); } + /** + * 查询结算总账单列表 + */ + @GetMapping("/listSimple") + public TableDataInfo listSimple(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.selectEmisSettleBillList(emisSettleBill); + return getDataTable(list); + } + /** * 检查是否重复