|
|
@@ -281,7 +281,7 @@ public class SaleNoticeController {
|
|
|
@RequestMapping(value = "/xls", params = RequestState.TODO, method = RequestMethod.GET)
|
|
|
public ModelAndView exportUndoVendors(String keyword, Long fromDate, Long endDate) {
|
|
|
PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
|
|
|
- pageInfo.sorting("date", Direction.DESC);
|
|
|
+ pageInfo.sorting("delivery", Direction.ASC);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
// 送货提醒状态为待发货
|
|
|
pageInfo.filter("status", Status.NOT_REPLY.value());
|
|
|
@@ -306,7 +306,7 @@ public class SaleNoticeController {
|
|
|
@RequestMapping(value = "/xls", params = RequestState.DONE, method = RequestMethod.GET)
|
|
|
public ModelAndView exportDoneVendors(String keyword, Long fromDate, Long endDate) {
|
|
|
PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
|
|
|
- pageInfo.sorting("date", Direction.DESC);
|
|
|
+ pageInfo.sorting("delivery", Direction.ASC);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
// 送货提醒状态为已发货
|
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
|
@@ -329,7 +329,7 @@ public class SaleNoticeController {
|
|
|
@RequestMapping(value = "/xls", params = RequestState.END, method = RequestMethod.GET)
|
|
|
public ModelAndView exporEndtVendors(String keyword, Long fromDate, Long endDate) {
|
|
|
PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
|
|
|
- pageInfo.sorting("date", Direction.DESC);
|
|
|
+ pageInfo.sorting("delivery", Direction.ASC);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
// 询价单状态为已结案
|
|
|
pageInfo.filter("end", (short) Constant.YES);
|
|
|
@@ -352,7 +352,7 @@ public class SaleNoticeController {
|
|
|
@RequestMapping(value = "/xls", params = "_state=waiting", method = RequestMethod.GET)
|
|
|
public ModelAndView exportWaitingVendors(String keyword, Long fromDate, Long endDate) {
|
|
|
PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
|
|
|
- pageInfo.sorting("date", Direction.DESC);
|
|
|
+ pageInfo.sorting("delivery", Direction.ASC);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
// 需要等待发货
|
|
|
pageInfo.filter("waiting", Constant.YES);
|