Explorar o código

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

hejq %!s(int64=7) %!d(string=hai) anos
pai
achega
96c57e58f0

+ 2 - 5
src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -57,11 +57,6 @@ public class AppInquiryController {
     @Autowired
     private PurchaseInquiryDetailService detailService;
 
-    /**
-     * 询价种类
-     */
-    private final String INQUIRYKIND = "publicInquiry";
-
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
     /**
@@ -429,6 +424,8 @@ public class AppInquiryController {
      */
     @RequestMapping(value = "/info/search", params = RequestState.TEAMS, method = RequestMethod.GET)
     public Page<PurchaseInquiryDetail> getPublicInquiry(int page, int size, String keyword) {
+        //询价种类
+        String INQUIRYKIND = "publicInquiry";
         if (!StringUtils.isEmpty(keyword)) {
             logger.log("客户询价单", "搜索已转报价的公共询价单");
             com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());

+ 15 - 3
src/main/java/com/uas/platform/b2b/model/Inquiry.java

@@ -1,10 +1,22 @@
 package com.uas.platform.b2b.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.uas.platform.core.model.Constant;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import javax.persistence.*;
-import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+import java.io.*;
 import java.util.Date;
 import java.util.Set;
 
@@ -131,7 +143,7 @@ public class Inquiry implements Serializable {
 	 * 客户已提交
 	 */
 	@Column(name = "in_checked")
-	private Short check;
+	private Short check = Constant.NO;
 
 	/**
 	 * 是否过期