WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java

 package com.spice.profitmandi.dao.entity.fofo;
+import com.spice.profitmandi.common.enumuration.ActivationType;
 import com.spice.profitmandi.common.enumuration.CounterSize;
 import com.spice.profitmandi.common.enumuration.FofoType;
 import com.spice.profitmandi.dao.entity.user.Address;
 import javax.persistence.*;
 @Entity
 @Table(name = "fofo.fofo_store", schema = "fofo")
 @NamedQueries({
-		@NamedQuery(name = "FofoStore.selectAllDtrUserIds", query = "select ua.userId from FofoStore fs join UserAccount ua on fs.id=ua.accountKey " +
+		@NamedQuery(name = "FofoStore.selectAllDtrUserIds", query = "select ua.userId from FofoStore fs join UserAccount ua on fs.id=ua.accountKey "
-				"where ua.type='saholic' and fs.internal=false and fs.active=true"),
+				+ "where ua.type='saholic' and fs.internal=false and fs.active=true"),
 		@NamedQuery(name = "FofoStore.selectGroupByBrandWarehousePartnerSale", query = "select new com.spice.profitmandi.dao.model.BrandWisePartnerSaleModel(foi.brand, "
 				+ "sum(case when concat(year(foi.createTimestamp), month(foi.createTimestamp))= :lms then CAST(foi.quantity*foi.mop  AS integer ) else 0 end),"
 				+ "sum(case when concat(year(foi.createTimestamp), month(foi.createTimestamp))= :lms then foi.quantity  else 0 end),"
 				+ "sum(case when concat(year(foi.createTimestamp), month(foi.createTimestamp))= :mtd  then CAST(foi.quantity*foi.mop  AS integer ) else 0 end),"
 	@Column
 	private String pan;
 	@Transient
 	private Address userAddress;
 	@Column(name = "internal")
 	private boolean internal;
 	@Column(name = "bags_last_credited")
 	private LocalDateTime bagsLastCredited;
 	@Column(name = "fofo_type")
 	@Enumerated(EnumType.STRING)
 	private FofoType fofoType;
+	@Column(name = "activation_type")
+	@Enumerated(EnumType.STRING)
+	private ActivationType activationType;
 	@Column(name = "active_timestamp")
 	private LocalDateTime activeTimeStamp;
+	public ActivationType getActivationType() {
+		return activationType;
+	}
+	public void setActivationType(ActivationType activationType) {
+		this.activationType = activationType;
+	}
 	public LocalDateTime getBagsLastCredited() {
 		return bagsLastCredited;
+	}
 	public void setBagsLastCredited(LocalDateTime bagsLastCredited) {
+	}
 	@Column(name = "grace_count")
 	private int graceCount;
 	public String getPan() {
 		return pan;
+	}
 	public void setPan(String pan) {
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
+		result = prime * result + ((activationType == null) ? 0 : activationType.hashCode());
 		result = prime * result + (active ? 1231 : 1237);
 		result = prime * result + ((activeTimeStamp == null) ? 0 : activeTimeStamp.hashCode());
 		result = prime * result + ((bagsLastCredited == null) ? 0 : bagsLastCredited.hashCode());
 		result = prime * result + ((code == null) ? 0 : code.hashCode());
 		result = prime * result + ((counterSize == null) ? 0 : counterSize.hashCode());
 		result = prime * result + (internal ? 1231 : 1237);
 		result = prime * result + (investmentOk ? 1231 : 1237);
 		result = prime * result + ((latitude == null) ? 0 : latitude.hashCode());
 		result = prime * result + ((longitude == null) ? 0 : longitude.hashCode());
 		result = prime * result + Float.floatToIntBits(minimumInvestment);
+		result = prime * result + ((pan == null) ? 0 : pan.hashCode());
 		result = prime * result + ((userAddress == null) ? 0 : userAddress.hashCode());
 		result = prime * result + warehouseId;
 		return result;
+	}
 		if (obj == null)
 			return false;
 		if (getClass() != obj.getClass())
 			return false;
 		FofoStore other = (FofoStore) obj;
+		if (activationType != other.activationType)
+			return false;
 		if (active != other.active)
 			return false;
 		if (activeTimeStamp == null) {
 			if (other.activeTimeStamp != null)
 				return false;
 				return false;
 		} else if (!longitude.equals(other.longitude))
 			return false;
 		if (Float.floatToIntBits(minimumInvestment) != Float.floatToIntBits(other.minimumInvestment))
 			return false;
+		if (pan == null) {
+			if (other.pan != null)
+				return false;
+		} else if (!pan.equals(other.pan))
+			return false;
 		if (userAddress == null) {
 			if (other.userAddress != null)
 				return false;
 		} else if (!userAddress.equals(other.userAddress))
 			return false;
 	@Override
 	public String toString() {
 		return "FofoStore [id=" + id + ", code=" + code + ", latitude=" + latitude + ", longitude=" + longitude
 				+ ", counterSize=" + counterSize + ", warehouseId=" + warehouseId + ", minimumInvestment="
 				+ minimumInvestment + ", graceDate=" + graceDate + ", investmentOk=" + investmentOk + ", active="
-				+ active + ", userAddress=" + userAddress + ", internal=" + internal + ", bagsLastCredited="
+				+ active + ", pan=" + pan + ", userAddress=" + userAddress + ", internal=" + internal
-				+ bagsLastCredited + ", fofoType=" + fofoType + ", activeTimeStamp=" + activeTimeStamp + ", graceCount="
+				+ ", bagsLastCredited=" + bagsLastCredited + ", fofoType=" + fofoType + ", activationType="
-				+ graceCount + "]";
+				+ activationType + ", activeTimeStamp=" + activeTimeStamp + ", graceCount=" + graceCount + "]";
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java – Rev 29936 → 30046