修改客户采购询价单已失效过滤条件

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

@@ -1,21 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.FileUpload;
@@ -41,6 +25,25 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+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;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 平台新增的询价单
@@ -249,6 +252,7 @@ public class PurcInquiryController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
+		pageParams.getFilters().put("id_decidestatus", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

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

@@ -427,7 +427,7 @@ public class SaleInquiryController {
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesDone(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已报价）");
 		PageInfo pageInfo = new PageInfo(params);
-		pageInfo.filter("overdue", Constant.NO);
+//		pageInfo.filter("overdue", Constant.NO);
 		pageInfo.filter("status", Status.REPLIED.value());
 		pageInfo.filter("invalid", Constant.NO);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());

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

@@ -517,8 +517,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				PredicateUtils.eq("invalid", Constant.YES, true),
 				// 未回复且客户系统已提交(this.status == 200 && null != this.getInquiry().getCheck() && this.getInquiry().getCheck() == 1)
 				PredicateUtils.and(PredicateUtils.eq("status", Status.NOT_REPLY.value(), false),
-						PredicateUtils.or(PredicateUtils.isNull("inquiry.check"),
-								PredicateUtils.eq("inquiry.check", Constant.YES, false))),
+						PredicateUtils.eq("inquiry.check", Constant.YES, false)),
 				// 未回复但是已过报价截止日期
 				PredicateUtils.and(PredicateUtils.eq("status", Status.NOT_REPLY.value(), false),
 						PredicateUtils.lte("inquiry.endDate", now.getTime(), false))