|
|
@@ -211,9 +211,10 @@ public class SaleApCheckController {
|
|
|
* @return 符合条件的客户信息
|
|
|
*/
|
|
|
@RequestMapping(value = "/customer", method = RequestMethod.GET)
|
|
|
- public SPage<Vendor> getCustomers(PageParams params, String keyword, String checkDate, Long fromDate, Long endDate) {
|
|
|
+ public SPage<Vendor> getCustomers(PageParams params, String keyword, String checkDate, String searchFilter) {
|
|
|
logger.log("应收对账单", "获取客户信息", "获取所有符合条件的客户");
|
|
|
- return purchaseApCheckService.getCustomerInfo(params, keyword, checkDate, fromDate, endDate);
|
|
|
+ SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
+ return purchaseApCheckService.getCustomerInfo(params, keyword, checkDate, filter.getFromDate(), filter.getEndDate());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -565,23 +566,11 @@ public class SaleApCheckController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/xls", method = RequestMethod.GET)
|
|
|
public ModelAndView export(ApcheckKeyWord keyword, Long fromDate, Long endDate, String checkDate) {
|
|
|
- List<Long> distributes = null;
|
|
|
- // 判断当前用户是否被客户分配
|
|
|
- if (!SystemSession.getUser().isSys()) {
|
|
|
- List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
|
|
|
- distributes = new ArrayList<>();
|
|
|
- if (!CollectionUtils.isEmpty(vendors)) {
|
|
|
- for (Vendor v : vendors) {
|
|
|
- distributes.add(v.getMyEnUU());
|
|
|
- }
|
|
|
- } else {
|
|
|
- return null;
|
|
|
- }
|
|
|
- }
|
|
|
+ List<ErpProdIODetail> details = getAllApchecksByDate(fromDate, endDate, keyword, checkDate).getDetails();
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
modelAndView.addObject("dateFormat", dateFormat);
|
|
|
- modelAndView.addObject("data", erpProdIODetailService.findXlsApChecks(distributes, keyword, fromDate, endDate, checkDate).getDetails());
|
|
|
+ modelAndView.addObject("data", details);
|
|
|
modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApCheck", "客户应收对账单"));
|
|
|
logger.log("客户应收对账单", "导出Excel列表", "导出全部Excel列表");
|
|
|
return modelAndView;
|