|
|
@@ -91,7 +91,7 @@ public class SaleInquiryMouldController {
|
|
|
pageParams.getFilters().put("im_enuu", new MultiValue(list, true));
|
|
|
}
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
|
- sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
|
|
|
+ sortList.add(new Sort("im_id", false, Type.LONG, 1L));
|
|
|
pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
|
|
|
return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
|
|
|
}
|
|
|
@@ -124,7 +124,7 @@ public class SaleInquiryMouldController {
|
|
|
pageParams.getFilters().put("im_overdue", Constant.NO);
|
|
|
pageParams.getFilters().put("im_valid", Constant.YES);
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
|
- sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
|
|
|
+ sortList.add(new Sort("im_id", false, Type.LONG, 1L));
|
|
|
pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
|
|
|
return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
|
|
|
}
|
|
|
@@ -377,6 +377,7 @@ public class SaleInquiryMouldController {
|
|
|
// 询价单状态为未回复
|
|
|
pageInfo.filter("status", Status.NOT_REPLY.value());
|
|
|
pageInfo.filter("overdue", Constant.NO);
|
|
|
+ pageInfo.filter("valid", Constant.YES);
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
modelAndView.addObject("dateFormat", dateFormat);
|
|
|
@@ -400,6 +401,7 @@ public class SaleInquiryMouldController {
|
|
|
pageInfo.filter("venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
// 询价单状态为已回复
|
|
|
pageInfo.filter("status", Status.REPLIED.value());
|
|
|
+ pageInfo.filter("valid", Constant.YES);
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
modelAndView.addObject("dateFormat", dateFormat);
|
|
|
@@ -447,7 +449,7 @@ public class SaleInquiryMouldController {
|
|
|
pageInfo.sorting("date", Direction.DESC);
|
|
|
pageInfo.filter("venduu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
// 询价单状态为已作废
|
|
|
- pageInfo.filter("status", Status.REPLIED.value());
|
|
|
+// pageInfo.filter("status", Status.REPLIED.value()); // 未报价也可以作废
|
|
|
pageInfo.filter("valid", Constant.NO);
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
dongbw