Subversion Repositories SmartDukaan

Rev

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

Rev 23891 Rev 23953
Line 906... Line 906...
906
					endDate, offset, limit);
906
					endDate, offset, limit);
907
			countItems = fofoOrderRepository.selectCountBySerialNumber(fofoId, searchValue, startDate, endDate);
907
			countItems = fofoOrderRepository.selectCountBySerialNumber(fofoId, searchValue, startDate, endDate);
908
		} else if (searchType == SearchType.ITEM_NAME && !searchValue.isEmpty()) {
908
		} else if (searchType == SearchType.ITEM_NAME && !searchValue.isEmpty()) {
909
			fofoOrders = fofoOrderRepository.selectByFofoIdAndItemName(fofoId, searchValue, startDate, endDate,
909
			fofoOrders = fofoOrderRepository.selectByFofoIdAndItemName(fofoId, searchValue, startDate, endDate,
910
					offset, limit);
910
					offset, limit);
-
 
911
		} else if (searchType == SearchType.INVOICE_NUMBER && !searchValue.isEmpty()) {
911
			countItems = fofoOrderRepository.selectCountByItemName(fofoId, searchValue, startDate, endDate);
912
			fofoOrders = Arrays.asList(fofoOrderRepository.selectByFofoIdAndInvoiceNumber(fofoId, searchValue));
-
 
913
			countItems = fofoOrders.size();
912
		} else {
914
		} else {
913
			fofoOrders = fofoOrderRepository.selectByFofoId(fofoId, startDate, endDate, offset, limit);
915
			fofoOrders = fofoOrderRepository.selectByFofoId(fofoId, startDate, endDate, offset, limit);
914
			countItems = fofoOrderRepository.selectCountByFofoId(fofoId, startDate, endDate);
916
			countItems = fofoOrderRepository.selectCountByFofoId(fofoId, startDate, endDate);
915
		}
917
		}
916
		Map<String, Object> map = new HashMap<>();
918
		Map<String, Object> map = new HashMap<>();