|
|
@@ -97,13 +97,13 @@ public class MakeOutOrderController {
|
|
|
SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
|
|
|
PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
|
|
|
pageInfo.sorting("date", Direction.DESC);
|
|
|
- pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
modelAndView.addObject("dateFormat", dateFormat);
|
|
|
modelAndView.addObject("state", "全部");
|
|
|
modelAndView.addObject("data", makeOrderService.findByPageInfo(pageInfo, filter).getContent());
|
|
|
- modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_全部"));
|
|
|
+ modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOutOrder", "委外加工单列表_全部"));
|
|
|
logger.log("自己委外加工单", "导出Excel列表", "导出全部Excel列表");
|
|
|
return modelAndView;
|
|
|
}
|