采购询价查询数据过滤条件更新

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -240,7 +240,6 @@ public class AppInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
-            pageParams.getFilters().put("id_decidestatus", Status.UNAUDIT.value());
             HashMap<String, Object> map = new HashMap<>();
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
@@ -253,8 +252,8 @@ public class AppInquiryController {
             PageInfo pageInfo = new PageInfo(page, size);
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("invalid", Constant.NO);
+            pageInfo.filter("overdue", Constant.NO);
             pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-            pageInfo.filter("decideStatus", Status.UNAUDIT.value());
             SearchFilter filter = new SearchFilter();
             SearchFilter distribute = userService.distribute();
             if (distribute != null && distribute.getDistribute() == null) {
@@ -309,7 +308,7 @@ public class AppInquiryController {
             if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
                 filter.setDistribute(distribute.getDistribute());
             }
-            return toPage(detailService.findInvalidByPageInfo(pageInfo, keyword, filter));
+            return toPage(detailService.findAppInvalidByPageInfo(pageInfo, keyword, filter));
         }
     }
 
@@ -343,6 +342,7 @@ public class AppInquiryController {
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
             HashMap<String, Object> map = new HashMap<>();
             map.put("id_invalid", Constant.YES);
+            map.put("id_overdue", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
@@ -355,6 +355,7 @@ public class AppInquiryController {
             pageInfo.filter("agreed", Constant.YES);
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("invalid", Constant.NO);
+            pageInfo.filter("overdue", Constant.NO);
             SearchFilter filter = new SearchFilter();
             SearchFilter distribute = userService.distribute();
             if (distribute != null && distribute.getDistribute() == null) {

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryDetail.java

@@ -7,7 +7,18 @@ import com.uas.platform.core.model.Status;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.CollectionUtils;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
 import java.util.Date;
 import java.util.Set;
 
@@ -207,7 +218,7 @@ public class PurchaseInquiryDetail extends AbstractOrderProduct {
 	 * (针对卖家的)是否采纳信息传输状态{待上传、已下载}
 	 */
 	@Column(name = "id_decidestatus")
-	private Short decideStatus;
+	private Short decideStatus = (short) Status.UNAUDIT.value();
 
 	/**
 	 * (针对卖家的)作废信息传输状态{待上传、已下载}

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryDetailService.java

@@ -55,4 +55,14 @@ public interface PurchaseInquiryDetailService {
 	 * @return
 	 */
 	List<PurchaseInquiryDetail> findById(Long id);
+
+    /**
+     * 移动端已失效，合并已过期已提交
+     *
+     * @param pageInfo 分页信息
+     * @param keyword 关键字
+     * @param filter 过滤条件
+     * @return SPage<PurchaseInquiryDetail>
+     */
+    SPage<PurchaseInquiryDetail> findAppInvalidByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
 }

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

@@ -159,4 +159,24 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
 	public List<PurchaseInquiryDetail> findById(Long id) {
 		return inquiryDetailDao.findByVendUUAndInquiry(SystemSession.getUser().getEnterprise().getUu(), id);
 	}
+
+    /**
+     * 移动端已失效，合并已过期已提交
+     *
+     * @param pageInfo 分页信息
+     * @param keyword  关键字
+     * @param filter   过滤条件
+     * @return SPage<PurchaseInquiryDetail>
+     */
+    @Override
+    public SPage<PurchaseInquiryDetail> findAppInvalidByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter) {
+        SimpleExpression overdue = new SimpleExpression("overdue", Constant.YES, CriterionExpression.Operator.EQ, true);
+        SimpleExpression invalid = new SimpleExpression("invalid", Constant.YES, CriterionExpression.Operator.EQ, true);
+        SimpleExpression disabled = new SimpleExpression("status", Status.DISABLED.value(), CriterionExpression.Operator.EQ, true);
+        SimpleExpression check = new SimpleExpression("inquiry.check", Constant.YES, CriterionExpression.Operator.EQ, true);
+        SimpleExpression[] checkExpressions = new SimpleExpression[]{check, overdue, invalid, disabled};
+        LogicalExpression logicalExpression = new LogicalExpression(checkExpressions, CriterionExpression.Operator.OR);
+        pageInfo.expression(logicalExpression);
+        return findByPageInfo(pageInfo, keyword, filter);
+    }
 }