报价单明细字段清理及代码调整

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

@@ -1,6 +1,7 @@
 package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.ps.entity.Status;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.domain.IPage;
 import com.uas.ps.inquiry.entity.Constant;
@@ -383,7 +384,7 @@ public class PublicInquiryController {
                 return map;
             } else if (_state.equals(OrderStatus.invalid.name())) {
                 log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                pageInfo.filter("invalid", Constant.YES);
+                pageInfo.filter("status", Status.DISABLED.value());
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
             } else if (_state.equals(OrderStatus.done.name())) {
@@ -461,7 +462,7 @@ public class PublicInquiryController {
                 return map;
             } else if (_state.equals(OrderStatus.invalid.name())) {
                 log.info("公共询价, 查询公共询价信息, tel:{}, Constant: {}, EnUU: {}, 报价的应用来源: {}", user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                pageInfo.filter("invalid", Constant.YES);
+                pageInfo.filter("status", Status.DISABLED.value());
                 map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
                 return map;
             } else if (_state.equals(OrderStatus.done.name())) {

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -256,13 +256,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
-	/**
-	 * 报价是否还有效 （目前来看此字段没有用到）
-	 *
-	 */
-	@Column(name = "id_invalid", insertable = false, updatable = false)
-	private Short invalid;
-
 	/**
 	 * 保存询价的应用
 	 */
@@ -788,14 +781,6 @@ public class PublicInquiryItem implements Serializable {
 		this.overdue = overdue;
 	}
 
-	public Short getInvalid() {
-		return invalid;
-	}
-
-	public void setInvalid(Short invalid) {
-		this.invalid = invalid;
-	}
-
     public Short getErpstatus() {
         return erpstatus;
     }
@@ -1124,7 +1109,6 @@ public class PublicInquiryItem implements Serializable {
 				", custLap=" + custLap +
 				", date=" + date +
 				", overdue=" + overdue +
-				", invalid=" + invalid +
 				", source='" + source + '\'' +
 				", qutoApp='" + qutoApp + '\'' +
 				", attaches=" + attaches +

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItemInfo.java

@@ -224,13 +224,6 @@ public class PublicInquiryItemInfo implements Serializable {
 	@Column(name = "id_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
-	/**
-	 *  报价是否还有效 （目前来看此字段没有用到）
-	 *
-	 */
-	@Column(name = "id_invalid", insertable = false, updatable = false)
-	private Short invalid;
-
 	/**
 	 * 应用来源ERP、B2B
 	 */
@@ -746,14 +739,6 @@ public class PublicInquiryItemInfo implements Serializable {
 		this.overdue = overdue;
 	}
 
-	public Short getInvalid() {
-		return invalid;
-	}
-
-	public void setInvalid(Short invalid) {
-		this.invalid = invalid;
-	}
-
     public Short getErpstatus() {
         return erpstatus;
     }
@@ -994,7 +979,6 @@ public class PublicInquiryItemInfo implements Serializable {
 				", custLap=" + custLap +
 				", date=" + date +
 				", overdue=" + overdue +
-				", invalid=" + invalid +
 				", source='" + source + '\'' +
 				", qutoApp='" + qutoApp + '\'' +
 				", needquantity=" + needquantity +

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

@@ -1383,17 +1383,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         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())) {
             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());
         } else if (state.equals(OrderStatus.end.name())) {
             pageInfo.filter("overdue", Constant.YES);
-            pageInfo.filter("invalid", Constant.NO);
         } else if (state.equals(OrderStatus.invalid.name())) {
             SimpleExpression overdue1 = new SimpleExpression("overdue", Constant.NO, CriterionExpression.Operator.NE, true);
             SimpleExpression invalid = new SimpleExpression("invalid", Constant.NO, CriterionExpression.Operator.NE, true);
@@ -1403,11 +1400,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         } else if (state.equals(OrderStatus.agreed.name())) {
             pageInfo.filter("agreed", Constant.YES);
             pageInfo.filter("status", Status.REPLIED.value());
-            pageInfo.filter("invalid", Constant.NO);
         } else if (state.equals(OrderStatus.refused.name())) {
             pageInfo.filter("agreed", Constant.NO);
             pageInfo.filter("status", Status.REPLIED.value());
-            pageInfo.filter("invalid", Constant.NO);
         }
         return pageInfo;
     }