WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java

 import com.spice.profitmandi.dao.entity.cs.Position;
 import com.spice.profitmandi.dao.entity.cs.Region;
 import com.spice.profitmandi.dao.entity.cs.Ticket;
 import com.spice.profitmandi.dao.entity.cs.TicketAssigned;
 import com.spice.profitmandi.dao.entity.cs.TicketCategory;
+import com.spice.profitmandi.dao.entity.cs.TicketSearchType;
 import com.spice.profitmandi.dao.entity.cs.TicketSubCategory;
 import com.spice.profitmandi.dao.entity.fofo.ActivityType;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.cs.TicketStatus;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 	@PostMapping(value = "/cs/createTicket")
 	public String createTicket(HttpServletRequest request, @RequestParam(name = "categoryId") int categoryId,
 			@RequestParam(name = "subCategoryId") int subCategoryId, @RequestParam(name = "message") String message,
 			Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<Ticket> tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(true),SortOrder.DESCENDING,0, 10);
+		List<Ticket> tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(true),
+				SortOrder.DESCENDING, 0, 10);
 		if (tickets.size() > 3 || tickets.size() == 3) {
 			model.addAttribute("response", mvcResponseSender.createResponseString(false));
 		} else {
 			csService.createTicket(loginDetails.getFofoId(), categoryId, subCategoryId, message);
 			model.addAttribute("response", mvcResponseSender.createResponseString(true));
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<Ticket> tickets = null;
 		List<TicketAssigned> ticketAssigneds = null;
-		//List<Integer> ticketIds = null;
+		// List<Integer> ticketIds = null;
 		long size = 0;
 		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 			LOGGER.info(ticketStatus);
 			LOGGER.info(sortOrder);
 			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
 					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
-			size = ticketRepository.selectAllCountByAssignee(authUser.getId(),Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
+			size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
 			LOGGER.info(size + "size");
+			ticketAssigneds = ticketAssignedRepository
-			ticketAssigneds=ticketAssignedRepository.selectByTicketIds(tickets.stream().map(x->x.getId()).collect(Collectors.toList()));
+					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 		} else {
 			LOGGER.info(ticketStatus);
 			LOGGER.info(sortOrder);
 			LOGGER.info(TicketStatus.CLOSED.equals(ticketStatus));
 			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
-					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)),sortOrder,offset, limit);
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
 			size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(),
 					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
+		}
 		authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<Ticket> tickets = null;
 		List<TicketAssigned> ticketAssigneds = null;
-		//List<Integer> ticketIds = null;
+		// List<Integer> ticketIds = null;
 		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
 					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
+			ticketAssigneds = ticketAssignedRepository
-			ticketAssigneds=ticketAssignedRepository.selectByTicketIds(tickets.stream().map(x->x.getId()).collect(Collectors.toList()));
+					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 		} else {
+			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
-			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)),sortOrder,offset, limit);
+					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
 			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
+		}
 		model.addAttribute("roleType", roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds())));
 		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
 				.getSubCategoryIdAndSubCategoryMap(tickets);
 	@GetMapping(value = "/cs/managerTicket")
 	public String getL2L3AndL4Tickets(HttpServletRequest request,
 			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
 			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+			@RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+			@RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		long size = 0;
 		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
 			size = ticketRepository.selectAllCount();
 		} else {
+			if (ticketSearchType == null) {
+				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
+						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm, offset, limit);
+				size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(),
+						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, 0);
+			} else {
-			tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), offset, limit);
+				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
+						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm, offset,
+						limit);
+				size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(),
+						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+			}
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
-			size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
 			if (tickets.size() > 0) {
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+			}
+		}
 		model.addAttribute("ticketStatusValues", TicketStatus.values());
 		model.addAttribute("orderByValues", SortOrder.values());
 		model.addAttribute("selectedticketStatus", ticketStatus);
 		model.addAttribute("selectedorderby", sortOrder);
 		model.addAttribute("tickets", tickets);
+		model.addAttribute("ticketSearchTypes", TicketSearchType.values());
+		model.addAttribute("ticketSearchType", ticketSearchType.getValue());
+		model.addAttribute("searchTerm", searchTerm);
 		model.addAttribute("authUserListMap", authUserListMap);
 		model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
 		return "managerTicket";
+	}
 	@GetMapping(value = "/cs/managerTicket-paginated")
 	public String getL2L3AndL4TicketsPaginated(HttpServletRequest request,
 			@RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
 			@RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+			@RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+			@RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 		List<Ticket> tickets = null;
 		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
 		} else {
+			if (ticketSearchType == null) {
+				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
+						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm, offset, limit);
+			} else {
-			tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), offset, limit);
+				tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder,
+						Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm, offset,
+						limit);
+			}
 			authUserListMap = csService.getAuthUserList(tickets, authUser);
 			if (tickets.size() > 0) {
 				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+			}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java – Rev 24701 → 24747