采购询价查询过滤条件异常的处理

src/main/java/com/uas/platform/b2b/controller/PurcInquiryController.java

@@ -34,7 +34,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -202,7 +201,7 @@ public class PurcInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search",params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryItem> getTodoInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（待回复）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -223,12 +222,12 @@ public class PurcInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search",params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryItem> getEndInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已失效）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
@@ -243,7 +242,7 @@ public class PurcInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search",params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryItem> getDoneInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -264,7 +263,7 @@ public class PurcInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search",params = RequestState.AGREED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryItem> getAgreedInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -284,7 +283,7 @@ public class PurcInquiryController {
 	 *
 	 * @return
 	 */
-	@RequestMapping(value = "/info/search",params = RequestState.REFUSED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
 	public SPage<PurchaseInquiryItem> getRefusedInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（未采纳）");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
@@ -299,25 +298,6 @@ public class PurcInquiryController {
 		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 	}
 
-	// /**
-	// * 未提交（主表查询，不建索引）
-	// *
-	// * @return
-	// */
-	// @RequestMapping(value = "/unapply", method = RequestMethod.GET)
-	// private SPage<PurcInquiry> getUnapply(PageParams params, String keyword)
-	// {
-	// com.uas.search.b2b.model.PageParams pageParams =
-	// searchService.convertPageParams(params, null);
-	// pageParams.getFilters().put("in_enuu",
-	// SystemSession.getUser().getEnterprise().getUu());
-	// pageParams.getFilters().put("in_enterystatus", Status.UNAPPLY.value());
-	// List<Sort> sortList = new ArrayList<>();
-	// sortList.add(new Sort("in_id", false, Type.LONG, new Long(1)));
-	// pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-	// return searchService.searchPurcInquiryCheckIds(keyword, pageParams);
-	// }
-
 	/**
 	 * 未提交（主表查询，不建索引）
 	 *
@@ -328,25 +308,6 @@ public class PurcInquiryController {
 		return purcInquiryService.getUnapply(params);
 	}
 
-	// /**
-	// * 已发布
-	// *
-	// * @param params
-	// * @return
-	// */
-	// @RequestMapping(value = "/submit", method = RequestMethod.GET)
-	// private SPage<PurcInquiry> getSubmit(PageParams params, String keyword) {
-	// com.uas.search.b2b.model.PageParams pageParams =
-	// searchService.convertPageParams(params, null);
-	// pageParams.getFilters().put("in_enuu",
-	// SystemSession.getUser().getEnterprise().getUu());
-	// pageParams.getFilters().put("in_enterystatus", Status.ENABLED.value());
-	// List<Sort> sortList = new ArrayList<>();
-	// sortList.add(new Sort("in_id", false, Type.LONG, new Long(1)));
-	// pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-	// return searchService.searchPurcInquiryCheckIds(keyword, pageParams);
-	// }
-
 	/**
 	 * 已发布
 	 *
@@ -524,7 +485,6 @@ public class PurcInquiryController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);
 	}

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -788,7 +788,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		// 通过相关的id在inquiry表中查询信息，再根据状态进行过滤
 		for (PurchaseInquiryItem purcInquiry : purchaseInquiryItem) {
 			PurchaseInquiry purcInqury = purchaseInquiryDao.findOne(purcInquiry.getInquiry().getId());
-			if (purcInqury.getOverdue().equals(Constant.NO)) {
+			if (null != purcInqury && purcInqury.getOverdue().equals(Constant.NO)) {
 				list.add(purcInqury);
 				number = list.size();
 			}