Subversion Repositories SmartDukaan

Rev

Rev 30185 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30185 Rev 30205
Line 12... Line 12...
12 
	private Float vivoAchievement;
 12 
	private Float vivoAchievement;
13 
	private Float oppoTarget;
 13 
	private Float oppoTarget;
14 
	private Float oppoAchievement;
 14 
	private Float oppoAchievement;
15 
	private Float itelTarget;
 15 
	private Float itelTarget;
16 
	private Float itelAchievement;
 16 
	private Float itelAchievement;
- 
 
 17 
	private Float almostNewTarget;
- 
 
 18 
	private Float almotNewAchievement;
17 
	private Float othersTarget;
 19 
	private Float othersTarget;
18 
	private Float othersAchievement;
 20 
	private Float othersAchievement;
19 
 
 21 
 
20 
	public TeamCommitmentModel(String commitmentBy, String partnerName, Float collectionTarget,
 22 
	public TeamCommitmentModel(String commitmentBy, String partnerName, Float collectionTarget,
21 
			Float collectionAchievement, Float samsungTarget, Float samsungAchievement, Float vivoTarget,
 23 
			Float collectionAchievement, Float samsungTarget, Float samsungAchievement, Float vivoTarget,
22 
			Float vivoAchievement, Float oppoTarget, Float oppoAchievement, Float itelTarget, Float itelAchievement,
 24 
			Float vivoAchievement, Float oppoTarget, Float oppoAchievement, Float itelTarget, Float itelAchievement,
23 
			Float othersTarget, Float othersAchievement) {
 25 
			Float almostNewTarget, Float almotNewAchievement, Float othersTarget, Float othersAchievement) {
24 
		super();
 26 
		super();
25 
		this.commitmentBy = commitmentBy;
 27 
		this.commitmentBy = commitmentBy;
26 
		this.partnerName = partnerName;
 28 
		this.partnerName = partnerName;
27 
		this.collectionTarget = collectionTarget;
 29 
		this.collectionTarget = collectionTarget;
28 
		this.collectionAchievement = collectionAchievement;
 30 
		this.collectionAchievement = collectionAchievement;
Line 32... Line 34...
32 
		this.vivoAchievement = vivoAchievement;
 34 
		this.vivoAchievement = vivoAchievement;
33 
		this.oppoTarget = oppoTarget;
 35 
		this.oppoTarget = oppoTarget;
34 
		this.oppoAchievement = oppoAchievement;
 36 
		this.oppoAchievement = oppoAchievement;
35 
		this.itelTarget = itelTarget;
 37 
		this.itelTarget = itelTarget;
36 
		this.itelAchievement = itelAchievement;
 38 
		this.itelAchievement = itelAchievement;
- 
 
 39 
		this.almostNewTarget = almostNewTarget;
- 
 
 40 
		this.almotNewAchievement = almotNewAchievement;
37 
		this.othersTarget = othersTarget;
 41 
		this.othersTarget = othersTarget;
38 
		this.othersAchievement = othersAchievement;
 42 
		this.othersAchievement = othersAchievement;
39 
	}
 43 
	}
40 
 
 44 
 
- 
 
 45 
	public Float getAlmostNewTarget() {
- 
 
 46 
		return almostNewTarget;
- 
 
 47 
	}
- 
 
 48 
 
- 
 
 49 
	public void setAlmostNewTarget(Float almostNewTarget) {
- 
 
 50 
		this.almostNewTarget = almostNewTarget;
- 
 
 51 
	}
- 
 
 52 
 
- 
 
 53 
	public Float getAlmotNewAchievement() {
- 
 
 54 
		return almotNewAchievement;
- 
 
 55 
	}
- 
 
 56 
 
- 
 
 57 
	public void setAlmotNewAchievement(Float almotNewAchievement) {
- 
 
 58 
		this.almotNewAchievement = almotNewAchievement;
- 
 
 59 
	}
- 
 
 60 
 
41 
	public String getCommitmentBy() {
 61 
	public String getCommitmentBy() {
42 
		return commitmentBy;
 62 
		return commitmentBy;
43 
	}
 63 
	}
44 
 
 64 
 
45 
	public void setCommitmentBy(String commitmentBy) {
 65 
	public void setCommitmentBy(String commitmentBy) {
Line 152... Line 172...
152 
 
 172 
 
153 
	@Override
 173 
	@Override
154 
	public int hashCode() {
 174 
	public int hashCode() {
155 
		final int prime = 31;
 175 
		final int prime = 31;
156 
		int result = 1;
 176 
		int result = 1;
- 
 
 177 
		result = prime * result + ((almostNewTarget == null) ? 0 : almostNewTarget.hashCode());
- 
 
 178 
		result = prime * result + ((almotNewAchievement == null) ? 0 : almotNewAchievement.hashCode());
157 
		result = prime * result + ((collectionAchievement == null) ? 0 : collectionAchievement.hashCode());
 179 
		result = prime * result + ((collectionAchievement == null) ? 0 : collectionAchievement.hashCode());
158 
		result = prime * result + ((collectionTarget == null) ? 0 : collectionTarget.hashCode());
 180 
		result = prime * result + ((collectionTarget == null) ? 0 : collectionTarget.hashCode());
159 
		result = prime * result + ((commitmentBy == null) ? 0 : commitmentBy.hashCode());
 181 
		result = prime * result + ((commitmentBy == null) ? 0 : commitmentBy.hashCode());
160 
		result = prime * result + ((itelAchievement == null) ? 0 : itelAchievement.hashCode());
 182 
		result = prime * result + ((itelAchievement == null) ? 0 : itelAchievement.hashCode());
161 
		result = prime * result + ((itelTarget == null) ? 0 : itelTarget.hashCode());
 183 
		result = prime * result + ((itelTarget == null) ? 0 : itelTarget.hashCode());
Line 178... Line 200...
178 
		if (obj == null)
 200 
		if (obj == null)
179 
			return false;
 201 
			return false;
180 
		if (getClass() != obj.getClass())
 202 
		if (getClass() != obj.getClass())
181 
			return false;
 203 
			return false;
182 
		TeamCommitmentModel other = (TeamCommitmentModel) obj;
 204 
		TeamCommitmentModel other = (TeamCommitmentModel) obj;
- 
 
 205 
		if (almostNewTarget == null) {
- 
 
 206 
			if (other.almostNewTarget != null)
- 
 
 207 
				return false;
- 
 
 208 
		} else if (!almostNewTarget.equals(other.almostNewTarget))
- 
 
 209 
			return false;
- 
 
 210 
		if (almotNewAchievement == null) {
- 
 
 211 
			if (other.almotNewAchievement != null)
- 
 
 212 
				return false;
- 
 
 213 
		} else if (!almotNewAchievement.equals(other.almotNewAchievement))
- 
 
 214 
			return false;
183 
		if (collectionAchievement == null) {
 215 
		if (collectionAchievement == null) {
184 
			if (other.collectionAchievement != null)
 216 
			if (other.collectionAchievement != null)
185 
				return false;
 217 
				return false;
186 
		} else if (!collectionAchievement.equals(other.collectionAchievement))
 218 
		} else if (!collectionAchievement.equals(other.collectionAchievement))
187 
			return false;
 219 
			return false;
Line 258... Line 290...
258 
		return "TeamCommitmentModel [commitmentBy=" + commitmentBy + ", partnerName=" + partnerName
 290 
		return "TeamCommitmentModel [commitmentBy=" + commitmentBy + ", partnerName=" + partnerName
259 
				+ ", collectionTarget=" + collectionTarget + ", collectionAchievement=" + collectionAchievement
 291 
				+ ", collectionTarget=" + collectionTarget + ", collectionAchievement=" + collectionAchievement
260 
				+ ", samsungTarget=" + samsungTarget + ", samsungAchievement=" + samsungAchievement + ", vivoTarget="
 292 
				+ ", samsungTarget=" + samsungTarget + ", samsungAchievement=" + samsungAchievement + ", vivoTarget="
261 
				+ vivoTarget + ", vivoAchievement=" + vivoAchievement + ", oppoTarget=" + oppoTarget
 293 
				+ vivoTarget + ", vivoAchievement=" + vivoAchievement + ", oppoTarget=" + oppoTarget
262 
				+ ", oppoAchievement=" + oppoAchievement + ", itelTarget=" + itelTarget + ", itelAchievement="
 294 
				+ ", oppoAchievement=" + oppoAchievement + ", itelTarget=" + itelTarget + ", itelAchievement="
- 
 
 295 
				+ itelAchievement + ", almostNewTarget=" + almostNewTarget + ", almotNewAchievement="
263 
				+ itelAchievement + ", othersTarget=" + othersTarget + ", othersAchievement=" + othersAchievement + "]";
 296 
				+ almotNewAchievement + ", othersTarget=" + othersTarget + ", othersAchievement=" + othersAchievement
- 
 
 297 
				+ "]";
264 
	}
 298 
	}
265 
 
 299 
 
266 
}
 300 
}