整理代码

src/main/java/com/uas/platform/b2b/dao/CustomerDao.java

@@ -9,6 +9,11 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * 客户关系表
+ *
+ * @author US50
+ */
 @Repository
 public interface CustomerDao extends JpaSpecificationExecutor<Customer>, GenericRepository<Customer, Long> {
 

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

@@ -1,301 +0,0 @@
-/*CopyRright (c)2014: <www.usoftchina.com>
- */
-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 org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 更换管理员账号申请
- * @author aof
- * @date 2015年12月26日 下午12:17:43
- */
-@Entity
-@Table(name = "sec$changeadmin")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2b.model.ChangeAdmin")
-public class ChangeAdmin implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "en_id")
-	private Long id;
-
-	@NotNull
-	@Column(name = "en_uu")
-	private Long uu;
-	
-	/**
-	 * 公司名称
-	 */
-	@NotNull
-	@Column(name = "en_name")
-	private String enName;
-	
-	/**
-	 * 状态
-	 */
-	@Column(name = "en_status")
-	private Short enStatus;
-	
-	/**
-	 * 传输到管理平台的状态
-	 */
-	@Column(name = "en_sendstatus")
-	private Short enSendStatus;
-	
-	/**
-	 * 公司邮箱
-	 */
-	@Column(name = "en_email")
-	private String enEmail;
-	
-	/**
-	 * 商业登记证号
-	 */
-	@Column(name = "en_businesscode")
-	private String enBussinessCode;
-	
-	/**
-	 * 营业执照图片路径id
-	 */
-	@OneToOne(cascade = { CascadeType.ALL })
-	@JoinColumn(name = "en_bussinesscodeattach")
-	private Attach enBussinessCodeAttach;
-	
-	/**
-	 * 申请时间
-	 */
-	@Column(name = "en_time")
-	private Date enDate;
-
-	/**
-	 * 管理员UU号
-	 */
-	@Column(name = "en_adminuu")
-	private Long enAdminuu;
-	
-	/**
-	 * 管理员密码
-	 */
-	@Column(name = "en_adminpassword")
-	private String enAdminPassword;
-	
-	@Column(name = "en_adminname")
-	private String enAdminName;// 管理员名字(转化传到管理平台)
-
-	@Column(name = "en_admintel")
-	private String enAdminTel;// 管理员手机号(转化传到管理平台)
-
-	@Column(name = "en_adminemail")
-	private String enAdminEmail;// 管理员邮箱(转化传到管理平台)
-
-	@Transient
-	private User admin;// 管理员（前台页面显示）
-	
-	@Transient
-	private Long enBussinesscodeImg;// 营业执照号附件id（转化传到管理平台）
-	
-	@Column(name = "en_remark")
-	private String enAuditRemark;// 审核(从管理平台传过来)
-
-	@JSONField(serialize = false)
-	@JsonIgnore
-	public String getEnAuditRemark() {
-		return enAuditRemark;
-	}
-
-	public void setEnAuditRemark(String enAuditRemark) {
-		this.enAuditRemark = enAuditRemark;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnAdminuu() {
-		return enAdminuu;
-	}
-
-	public void setEnAdminuu(Long enAdminuu) {
-		this.enAdminuu = enAdminuu;
-	}
-
-	private Short enable;
-
-	public Long getUu() {
-		return uu;
-	}
-
-	public void setUu(Long uu) {
-		this.uu = uu;
-	}
-
-	public String getEnName() {
-		return enName;
-	}
-
-	public void setEnName(String enName) {
-		this.enName = enName;
-	}
-
-	public Short getEnStatus() {
-		return enStatus;
-	}
-
-	public void setEnStatus(Short enStatus) {
-		this.enStatus = enStatus;
-	}
-
-	public String getEnBussinessCode() {
-		return enBussinessCode;
-	}
-
-	public void setEnBussinessCode(String enBussinessCode) {
-		this.enBussinessCode = enBussinessCode;
-	}
-
-	public Date getEnDate() {
-		return enDate;
-	}
-
-	public void setEnDate(Date enDate) {
-		this.enDate = enDate;
-	}
-
-	public Short getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Short enable) {
-		this.enable = enable;
-	}
-
-	public String getEnEmail() {
-		return enEmail;
-	}
-
-	public void setEnEmail(String enEmail) {
-		this.enEmail = enEmail;
-	}
-
-	public Attach getEnBussinessCodeAttach() {
-		return enBussinessCodeAttach;
-	}
-
-	public void setEnBussinessCodeAttach(Attach enBussinessCodeAttach) {
-		this.enBussinessCodeAttach = enBussinessCodeAttach;
-	}
-
-	public String getEnAdminTel() {
-		return enAdminTel;
-	}
-
-	public void setEnAdminTel(String enAdminTel) {
-		this.enAdminTel = enAdminTel;
-	}
-
-	public String getEnAdminEmail() {
-		return enAdminEmail;
-	}
-
-	public void setEnAdminEmail(String enAdminEmail) {
-		this.enAdminEmail = enAdminEmail;
-	}
-
-	public Long getEnBussinesscodeImg() {
-		return enBussinesscodeImg;
-	}
-
-	public void setEnBussinesscodeImg(Long enBussinesscodeImg) {
-		this.enBussinesscodeImg = enBussinesscodeImg;
-	}
-
-	public Short getEnSendStatus() {
-		return enSendStatus;
-	}
-
-	public void setEnSendStatus(Short enSendStatus) {
-		this.enSendStatus = enSendStatus;
-	}
-
-	public User getAdmin() {
-		return admin;
-	}
-
-	public void setAdmin(User admin) {
-		this.admin = admin;
-	}
-
-	public String getEnAdminName() {
-		return enAdminName;
-	}
-
-	public void setEnAdminName(String enAdminName) {
-		this.enAdminName = enAdminName;
-	}
-
-	@JsonIgnore
-	@JSONField(serialize = false)
-	public String getEnAdminPassword() {
-		return enAdminPassword;
-	}
-
-	public void setEnAdminPassword(String enAdminPassword) {
-		this.enAdminPassword = enAdminPassword;
-	}
-
-	@JsonIgnore
-	@JSONField(serialize = false)
-	public boolean isEnabled() {
-		return this.getEnable() != null && this.getEnable() == Constant.YES;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((uu == null) ? 0 : uu.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-            return true;
-        }
-		if (obj == null) {
-            return false;
-        }
-		if (getClass() != obj.getClass()) {
-            return false;
-        }
-		ChangeAdmin other = (ChangeAdmin) obj;
-		if (uu == null) {
-			if (other.uu != null) {
-                return false;
-            }
-		} else if (!uu.equals(other.uu)) {
-            return false;
-        }
-		return true;
-	}
-	
-}

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

@@ -8,12 +8,12 @@ import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 系统一些操作的记录，不关联企业，方便针对异常进行查看
  *
- * Created by hejq on 2017-12-12.
+ * @author hejq
+ * @date 2017-12-12
  */
 @Entity
 @Table(name = "log$common")

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

@@ -1,23 +1,18 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.uas.platform.core.persistence.Logger;
 import com.uas.platform.core.persistence.OtherUserUU;
 import com.uas.platform.core.persistence.StatusColumn;
 import com.uas.platform.core.persistence.UserUU;
 
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 客户关系表
+ *
+ * @author US50
+ */
 @Entity
 @Table(name = "sale$customers")
 @Logger(enUU = "cu_myenuu", userUU = "cu_myuseruu")

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

@@ -6,7 +6,9 @@ import java.io.Serializable;
 /**
  * 关于一些订单的页面的默认值,后续关于选择的可以设置成配置型的
  *
- * Created by hejq on 2018-02-26.
+ *
+ * @author hejq
+ * @date 2018-02-26
  */
 @Entity
 @Table(name = "defaultvalue", indexes = {@Index(name = "defaultvalue_kind_key_IDX", columnList = "dv_kind,dv_key")})

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

@@ -6,7 +6,9 @@ import java.io.Serializable;
 /**
  * 关于代采订单一些默认字段的值
  *
- * Created by hejq on 2017-12-06.
+ *
+ * @author hejq
+ * @date 2017-12-06
  */
 @Table(name = "deputy$defaultvalue", indexes = {@Index(name = "deputy$defaultvalue_enuu_key_IDX", columnList = "de_enuu, de_key")})
 @Entity

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

@@ -7,7 +7,9 @@ import java.util.Date;
 
 /**
  *  用于招标中的企业基本信息
- * Created by dongbw on 17/03/07 11:50.
+ *
+ * @author dongbw
+ * @date 17/03/07 11:50
  */
 
 @Table(name = "sec$enterprisebaseinfo")

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

@@ -14,84 +14,141 @@ import java.util.List;
  * 
  */
 public class EnterpriseDetail {
-	private String name; //企业名称
-	private String shortName; //企业简称
-	private Long uu; //UU号
-	private String address; //企业地址
-	private String url;  //企业主页
-	private String management; //经营模式
-	private String products;  //主营产品
-	private String infos;
-	private String businessCode; // 营业执照
-	private String corporation; // 法人代表
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getShortName() {
-		return shortName;
-	}
-	public void setShortName(String shortName) {
-		this.shortName = shortName;
-	}
-	public Long getUu() {
-		return uu;
-	}
-	public void setUu(Long uu) {
-		this.uu = uu;
-	}
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-	public String getUrl() {
-		return url;
-	}
-	public void setUrl(String url) {
-		this.url = url;
-	}
-	public String getManagement() {
-		return management;
-	}
-	public void setManagement(String management) {
-		this.management = management;
-	}
-	public String getProducts() {
-		return products;
-	}
-	public void setProducts(String products) {
-		this.products = products;
-	}
-	public String getInfos() {
-		return infos;
-	}
-	public void setInfos(String infos) {
-		this.infos = infos;
-	}
 
-	public String getBusinessCode() {
-		return businessCode;
-	}
+    /**
+     * 企业名称
+     */
+    private String name;
 
-	public void setBusinessCode(String businessCode) {
-		this.businessCode = businessCode;
-	}
+    /**
+     * 企业简称
+     */
+    private String shortName;
 
-	public String getCorporation() {
-		return corporation;
-	}
+    /**
+     * UU号
+     */
+    private Long uu;
 
-	public void setCorporation(String corporation) {
-		this.corporation = corporation;
-	}
+    /**
+     * 企业地址
+     */
+    private String address;
+
+    /**
+     * 企业主页
+     */
+    private String url;
+
+    /**
+     * 经营模式
+     */
+    private String management;
+
+    /**
+     * 主营产品
+     */
+    private String products;
+
+    /**
+     * 信息
+     */
+    private String infos;
+
+    /**
+     * 营业执照
+     */
+    private String businessCode;
+
+    /**
+     * 法人代表
+     */
+    private String corporation;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getManagement() {
+        return management;
+    }
+
+    public void setManagement(String management) {
+        this.management = management;
+    }
+
+    public String getProducts() {
+        return products;
+    }
+
+    public void setProducts(String products) {
+        this.products = products;
+    }
+
+    public String getInfos() {
+        return infos;
+    }
+
+    public void setInfos(String infos) {
+        this.infos = infos;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getCorporation() {
+        return corporation;
+    }
+
+    public void setCorporation(String corporation) {
+        this.corporation = corporation;
+    }
 
-	public EnterpriseDetail() {
+    public EnterpriseDetail() {
 
 	}
+	
 	public EnterpriseDetail(Enterprise enterprise) {
 		this.name = enterprise.getEnName();
 		this.shortName = enterprise.getEnShortname();

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

@@ -10,7 +10,8 @@ import java.util.Date;
 /**
  * 记录平台接口报错异常
  *
- * Created by hejq on 2018-06-20.
+ * @author hejq
+ * @date 2018-06-20
  */
 @Table(name = "log$error")
 @Entity

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

@@ -10,7 +10,8 @@ import java.io.Serializable;
 /**
  * 日志详情，记录一些不需要一直展示的数据
  *
- * Created by hejq on 2018-06-22.
+ * @author hejq
+ * @date 2018-06-22
  */
 @Entity
 @Table(name = "log$error$detail")

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

@@ -2,7 +2,13 @@ package com.uas.platform.b2b.model;
 
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+/**
+ * 文件上传接口
+ *
+ * @author hejq
+ */
 public class FileUpload {
+
 	private CommonsMultipartFile file;
 
 	public CommonsMultipartFile getFile() {

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

@@ -1,44 +0,0 @@
-package com.uas.platform.b2b.model;
-
-/**
- * 搜索过滤条件
- *
- * Created by hejq on 2018-01-19.
- */
-public class FilterCondition {
-
-    /**
-     * 关键字
-     */
-    private String key;
-
-    /**
-     * 值
-     */
-    private String value;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public FilterCondition() {
-
-    }
-
-    public FilterCondition(String key, Object no) {
-        this.key = key;
-        this.value = no.toString();
-    }
-}

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

@@ -7,7 +7,8 @@ import java.util.Date;
 /**
  * 用户的指引开关设置
  *
- * Created by hejq on 2017-12-13.
+ * @author hejq
+ * @date 2017-12-13
  */
 @Entity
 @Table(name = "sec$guidesetting")

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

@@ -6,7 +6,8 @@ import java.util.Date;
 /**
  * 针对用户的询价推荐提醒
  *
- * Created by hejq on 2018-01-31.
+ * @author hejq
+ * @date 2018-01-31
  */
 public class InquiryRemind implements Serializable {
 

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

@@ -190,15 +190,5 @@ public class Kind implements Serializable {
 		this.componentsuffix = componentsuffix;
 	}
 
-	/*
-	 * public KindUas converUas(Kind kind){ KindUas uas = new KindUas();
-	 * uas.setComponentPrefix(kind.getComponentPrefix());
-	 * uas.setComponentsuffix(kind.getComponentsuffix());
-	 * uas.setCount(kind.getCount()); uas.setDetno(kind.getDetno());
-	 * uas.setId(kind.getId()); uas.setIsLeaf(kind.getIsLeaf());
-	 * uas.setLevel(kind.getLevel()); uas.setNameCn(kind.getNameCn());
-	 * uas.setNameEn(kind.getNameEn()); uas.setParentid(kind.getParentid());
-	 * return uas; }
-	 */
 
 }

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

@@ -9,7 +9,8 @@ import java.util.Date;
 /**
  * 这张表用来记录ERP订单上传过程中未存在的物料信息
  *
- * Created by hejq on 2018-03-14.
+ * @author hejq
+ * @date 2018-03-14
  */
 @Table(name = "erp$products")
 @Entity

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

@@ -1,17 +1,15 @@
 package com.uas.platform.b2b.model;
 
-import java.util.Date;
-
-import javax.persistence.*;
-
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
+import javax.persistence.*;
+import java.util.Date;
+
 /**
  * 系统公告
  * 
  * @author yingp
- *
  */
 @Entity
 @Table(name = "info$notices")

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

@@ -1,20 +1,11 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * 系统公告（正文）
  * 
  * @author yingp
- *
  */
 @Entity
 @Table(name = "info$noticesbody")

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

@@ -3,7 +3,8 @@ package com.uas.platform.b2b.model;
 /**
  * 单据状态
  *
- * Created by hejq on 2018-01-20.
+ * @author hejq
+ * @date 2018-01-20
  */
 public enum OrderStatus {
 

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

@@ -1,5 +1,11 @@
 package com.uas.platform.b2b.model;
 
+/**
+ * 单据类型
+ *
+ * @author hejq
+ * @date 2018-09-07 8:55
+ */
 public enum OrderType {
 	/**
 	 * {@code 100 采购}

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

@@ -1,21 +1,13 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 未读消息统计表
- * Created by wangmh on 2017/7/7.
+ *
+ * @author wangmh
+ * @date 2017/7/7
  */
 @Entity
 @Table(name = "purc$pagingreleasecount")

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

@@ -8,6 +8,7 @@ import java.io.Serializable;
  * 物料状态表
  * Created by dongbw
  * 18/01/19 13:38.
+ * @author US50
  */
 @Entity
 @Table(name = "product$status")

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

@@ -6,7 +6,8 @@ import java.util.Date;
 /**
  * 用户个人产品库
  *
- * Created by hejq on 2017-11-08.
+ * @author hejq
+ * @date 2017-11-08
  */
 public class ProductUsers implements Serializable {
 

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

@@ -1,26 +1,17 @@
 package com.uas.platform.b2b.model;
 
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-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.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
 /**
  * 买家应付（卖家应收）对账单
- * */
+ *
+ * @author US50
+ */
 @Entity
 @Table(name="purc$apcheck")
 @Where(clause = "pa_checkstatus = '已确认'")

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

@@ -1,26 +1,17 @@
 package com.uas.platform.b2b.model;
 
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-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.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
 /**
  * 买家应付（卖家应收）对账单
- * */
+ *
+ * @author US50
+ */
 @Entity
 @Where(clause = "pa_checkstatus = '不同意' or pa_checkstatus = '已作废'")
 @Table(name="purc$apcheck")

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

@@ -10,6 +10,7 @@ import java.util.Set;
 
 /**
  * 买家应付（卖家应收）对账单
+ * @author US50
  */
 @Entity
 @Table(name = "purc$apcheck")

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

@@ -10,6 +10,7 @@ import java.util.Set;
 
 /**
  * 买家应付（卖家应收）对账单明细
+ * @author US50
  */
 @Table(name = "purc$apcheckitem")
 @Entity

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

@@ -1,25 +1,17 @@
 package com.uas.platform.b2b.model;
 
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-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.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
 /**
  * 买家应付（卖家应收）对账单
- * */
+ *
+ * @author US50
+ */
 @Entity
 @Where(clause = "pa_checkstatus = '未对账'")
 @Table(name="purc$apcheck")

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

@@ -6,7 +6,8 @@ import java.util.Date;
 import java.util.Set;
 
 /**
- * 采购预单
+ * 采购预测单
+ * @author US50
  */
 @Table(name = "purc$forecast", indexes = {@Index(name = "unique_enuu_code", columnList = "pf_enuu,pf_code", unique = true)})
 @Entity

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

@@ -7,7 +7,6 @@ import com.uas.platform.core.model.Status;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Set;
@@ -20,6 +19,7 @@ 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 US50
  */
 
 @Table(name = "purc$inquirymould")

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

@@ -7,6 +7,11 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import javax.persistence.*;
 import java.util.*;
 
+/**
+ * 采购单明细
+ *
+ * @author US50
+ */
 @Table(name = "purc$orderitems")
 @Entity
 public class PurchaseOrderAllItem extends AbstractOrderProduct {

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

@@ -2,11 +2,15 @@ package com.uas.platform.b2b.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.util.Date;
 
+/**
+ * 购物车明细
+ *
+ * @author US50
+ */
 @Table(name = "purc$orderitems")
 @Entity
 public class PurchaseOrderCartItem extends AbstractOrderProduct {

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

@@ -1,8 +1,6 @@
 package com.uas.platform.b2b.model;
 
 import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.locks.Condition;
 
 /**
  * 单据查询搜索条件
@@ -66,11 +64,6 @@ public class SearchFilter {
 	 */
 	private Long userUU;
 
-	/**
-	 * 条件
-	 */
-	private List<FilterCondition> conditions;
-
 	public String getKeyword() {
 		return keyword;
 	}
@@ -144,11 +137,4 @@ public class SearchFilter {
 		this.userUU = userUU;
 	}
 
-    public List<FilterCondition> getConditions() {
-        return conditions;
-    }
-
-    public void setConditions(List<FilterCondition> conditions) {
-        this.conditions = conditions;
-    }
 }