Browse Source

修改送货提醒EXCEL的导出排序方式与列表显示一致

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1228 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
shenj 10 years ago
parent
commit
60fb3763d7

+ 4 - 4
src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -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);