Subversion Repositories SmartDukaan

Rev

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

Rev 26250 Rev 26958
Line 120... Line 120...
120 
		leadActivity.setLeadId(lead.getId());
 120 
		leadActivity.setLeadId(lead.getId());
121 
		leadActivity.setRemark(createRefferalRequest.getRemark());
 121 
		leadActivity.setRemark(createRefferalRequest.getRemark());
122 
 
 122 
 
123 
		if (createRefferalRequest.getStatus().equals(LeadStatus.followUp)) {
 123 
		if (createRefferalRequest.getStatus().equals(LeadStatus.followUp)) {
124 
			leadActivity.setSchelduleTimestamp(createRefferalRequest.getSchelduleTimestamp());
 124 
			leadActivity.setSchelduleTimestamp(createRefferalRequest.getSchelduleTimestamp());
- 
 
 125 
			leadActivity.setClosureTimestamp(createRefferalRequest.getClosureTimestamp());
125 
		} else {
 126 
		} else {
126 
			leadActivity.setSchelduleTimestamp(null);
 127 
			leadActivity.setSchelduleTimestamp(null);
- 
 
 128 
			leadActivity.setClosureTimestamp(null);
127 
		}
 129 
		}
128 
		leadActivity.setCreatedTimestamp(LocalDateTime.now());
 130 
		leadActivity.setCreatedTimestamp(LocalDateTime.now());
129 
		leadActivityRepository.persist(leadActivity);
 131 
		leadActivityRepository.persist(leadActivity);
130 
 
 132 
 
131 
		return responseSender.ok(true);
 133 
		return responseSender.ok(true);
Line 160... Line 162...
160 
	@ApiImplicitParams({
 162 
	@ApiImplicitParams({
161 
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 163 
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
162 
	public ResponseEntity<?> leadUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
 164 
	public ResponseEntity<?> leadUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
163 
			@RequestParam(name = "status") LeadStatus status, @RequestParam(name = "colorCheck") Boolean colorCheck,
 165 
			@RequestParam(name = "status") LeadStatus status, @RequestParam(name = "colorCheck") Boolean colorCheck,
164 
			@RequestParam(name = "remark") String remark,
 166 
			@RequestParam(name = "remark") String remark,
165 
			@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
 167 
			@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp,
- 
 
 168 
			@RequestParam(name = "closureTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime closureTimestamp)
166 
			throws ProfitMandiBusinessException {
 169 
			throws ProfitMandiBusinessException {
167 
 
 170 
 
168 
		Lead lead = leadRepository.selectById(id);
 171 
		Lead lead = leadRepository.selectById(id);
169 
 
 172 
 
170 
		LeadActivity leadActivity = new LeadActivity();
 173 
		LeadActivity leadActivity = new LeadActivity();
171 
		lead.setStatus(status);
 174 
		lead.setStatus(status);
172 
		leadActivity.setRemark(remark);
 175 
		leadActivity.setRemark(remark);
173 
		leadActivity.setLeadId(id);
 176 
		leadActivity.setLeadId(id);
174 
		leadActivity.setCreatedTimestamp(LocalDateTime.now());
 177 
		leadActivity.setCreatedTimestamp(LocalDateTime.now());
175 
		leadActivity.setSchelduleTimestamp(null);
 178 
		leadActivity.setSchelduleTimestamp(null);
- 
 
 179 
		leadActivity.setClosureTimestamp(null);
176 
		lead.setUpdatedTimestamp(LocalDateTime.now());
 180 
		lead.setUpdatedTimestamp(LocalDateTime.now());
177 
		if (colorCheck == true) {
 181 
		if (colorCheck == true) {
178 
			lead.setColor("Green");
 182 
			lead.setColor("Green");
179 
		} else {
 183 
		} else {
180 
			lead.setColor("Yellow");
 184 
			lead.setColor("Yellow");
181 
		}
 185 
		}
182 
		if (status == LeadStatus.followUp) {
 186 
		if (status == LeadStatus.followUp) {
183 
 
 187 
 
184 
			leadActivity.setSchelduleTimestamp(schelduleTimestamp);
 188 
			leadActivity.setSchelduleTimestamp(schelduleTimestamp);
- 
 
 189 
			leadActivity.setClosureTimestamp(closureTimestamp);
185 
 
 190 
 
186 
		} else {
 191 
		} else {
187 
 
 192 
 
188 
			leadActivity.setSchelduleTimestamp(null);
 193 
			leadActivity.setSchelduleTimestamp(null);
- 
 
 194 
			leadActivity.setClosureTimestamp(null);
189 
 
 195 
 
190 
		}
 196 
		}
191 
		leadActivityRepository.persist(leadActivity);
 197 
		leadActivityRepository.persist(leadActivity);
192 
		return responseSender.ok(true);
 198 
		return responseSender.ok(true);
193 
 
 199