Переглянути джерело

模具询价相关问题处理

hejq 7 роки тому
батько
коміт
0c2bbc90ab

+ 0 - 8
src/main/java/com/uas/platform/b2b/controller/SaleInquiryMouldController.java

@@ -211,8 +211,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -237,8 +235,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -265,8 +261,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -295,8 +289,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);

+ 3 - 13
src/main/java/com/uas/platform/b2b/model/PurchaseInquiryMouldInfo.java

@@ -4,19 +4,7 @@ import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-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 javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
@@ -30,6 +18,8 @@ import java.util.Set;
  * SELECT purc$inquirymould."IM_ID",purc$inquirymould."IM_CODE",purc$inquirymould."IM_CURRENCY", purc$inquirymould."IM_ADOPTSTATUS", purc$inquirymould."IM_AUDITDATE", purc$inquirymould."IM_AUDITOR", purc$inquirymould."IM_DATE", purc$inquirymould."IM_ENDDATE", purc$inquirymould."IM_ENUU", purc$inquirymould."IM_ERPSOURCEID", purc$inquirymould."IM_RECORDDATE", purc$inquirymould."IM_RECORDER",purc$inquirymould."IM_RECORDERID", purc$inquirymould."IM_REMARK", purc$inquirymould."IM_SENDSTATUS", purc$inquirymould."IM_SOURCE", purc$inquirymould."IM_SOURCEID", purc$inquirymould."IM_SOURCETYPE", purc$inquirymould."IM_STATUS", purc$inquirymould."IM_STATUSCODE", purc$inquirymould."IM_TAXRATE", purc$inquirymould."IM_VENDNAME", purc$inquirymould."IM_VENDUU", purc$inquirymould."IM_VALID" ,purc$inquirymould."IM_BACKSTATUS", purc$inquirymould."IM_CHECKED", purc$inquirymould."IM_RECORDERUU", purc$inquirymould."IM_REPLYSENDSTATUS", purc$inquirymould."IM_VENDUSERUU" ,case when trunc(im_enddate) + 1 < sysdate then 1 else 0 end as im_overdue from purc$inquirymould
  * </pre>
  *
+ * @author hejq
+ * @date 2018-07-27 14:09
  */
 
 @Table(name = "v$purc$inquirymould")