增加已转报价对过期条件的判断

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -371,7 +371,7 @@ public class PublicInquiryController {
      */
     @HttpLog
     @RequestMapping(value = "/quotation/list", method = RequestMethod.GET)
-    public IPage<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state) {
+    public IPage<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state, Short overdue) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
         if (pageInfo.getOffset() == 0) {
             pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
@@ -386,7 +386,7 @@ public class PublicInquiryController {
             throw new IllegalAccessError("请先传入企业信息");
         }
         if (null != _state) {
-            pageInfo = publicInquiryService.covert(pageInfo, _state);
+            pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
         }
         logger.log("公共询价", "查询已转报价询价列表信息", "状态: " + _state == null ? "all" : _state, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         return publicInquiryService.findByPageInfo(pageInfo, searchFilter);
@@ -412,7 +412,7 @@ public class PublicInquiryController {
      */
     @HttpLog
     @RequestMapping(value = "/quotationList", method = RequestMethod.GET)
-    public Page<PublicInquiryItemInfo> getQuotationList(PageInfo pageInfo, String filter, String _state) {
+    public Page<PublicInquiryItemInfo> getQuotationList(PageInfo pageInfo, String filter, String _state, Short overdue) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
         if (pageInfo.getOffset() == 0) {
             pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
@@ -420,7 +420,7 @@ public class PublicInquiryController {
         pageInfo.setSort(sort);
         SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
         if (null != _state) {
-            pageInfo = publicInquiryService.covert(pageInfo, _state);
+            pageInfo = publicInquiryService.covert(pageInfo, _state, overdue);
         }
         return publicInquiryService.findListByPageInfo(pageInfo, searchFilter);
     }

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -175,7 +175,7 @@ public interface PublicInquiryService {
      * @param state 过滤条件
      * @return
      */
-    PageInfo covert(PageInfo pageInfo, String state);
+    PageInfo covert(PageInfo pageInfo, String state, Short overdue);
 
     /**
      * 获取公共询价列表信息

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1024,13 +1024,15 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      * @return
      */
     @Override
-    public PageInfo covert(PageInfo pageInfo, String state) {
+    public PageInfo covert(PageInfo pageInfo, String state, Short overdue) {
         if (state.equals(OrderStatus.todo.name())) {
             pageInfo.filter("status", Status.NOT_REPLY.value());
             pageInfo.filter("overdue", Constant.NO);
             pageInfo.filter("invalid", Constant.NO);
         } else if (state.equals(OrderStatus.done.name())) {
-            pageInfo.filter("overdue", Constant.NO);
+            if (StringUtils.isEmpty(overdue) || !overdue.equals(Constant.YES)) {
+                pageInfo.filter("overdue", Constant.NO);
+            }
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("invalid", Constant.NO);
             pageInfo.filter("decideStatus", Status.UNAUDIT.value());