WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

+		}
 		String fileName = "InvestmentSummary-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv";
 		for (Map.Entry<String, Set<String>> storeGuyEntry : csService.getAuthUserPartnerEmailMapping().entrySet()) {
-			/*
-			 * List<List<? extends Serializable>> filteredRows =
+			List<List<? extends Serializable>> filteredRows = storeGuyEntry.getValue().stream()
-			 * storeGuyEntry.getValue().stream() .map(x -> partnerRow.get(x)).filter(x -> x
-			 * != null).collect(Collectors.toList());
+					.map(x -> partnerRow.get(x)).filter(x -> x != null).collect(Collectors.toList());
-			 */
-			List<List<? extends Serializable>> filteredRows = new ArrayList<>();
 			ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, filteredRows);
-			// String[] sendToArray = new String[] {storeGuyEntry.getKey()};
+			String[] sendToArray = new String[] {storeGuyEntry.getKey()};
-			for (String storeGuyString : storeGuyEntry.getValue()) {
-				String[] sendToArray = new String[] {storeGuyString};
-				Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Partner Investment Summary", "PFA",
+			Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Partner Investment Summary", "PFA",
-						fileName, new ByteArrayResource(baos.toByteArray()));
+					fileName, new ByteArrayResource(baos.toByteArray()));
-			}
+		}
-		/*
-		 * ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, rows);
+		ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, rows);
-		 * String[] sendToArray = sendTo.toArray(new String[sendTo.size()]);
+		String[] sendToArray = sendTo.toArray(new String[sendTo.size()]);
-		 * Utils.sendMailWithAttachment(googleMailSender, sendToArray, null,
+		Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Partner Investment Summary", "PFA", fileName,
-		 * "Partner Investment Summary", "PFA", fileName, new
-		 * ByteArrayResource(baos.toByteArray()));
+				new ByteArrayResource(baos.toByteArray()));
-		 */
+	}
 	private Map<String, SaleRoles> getPartnerEmailSalesMap() {
 		Map<String, SaleRoles> partnerEmailSalesMap = new HashMap<>();
 		Map<Integer, AuthUser> authUsersMap = authRepository.selectAllActiveUser().stream()
 				.collect(Collectors.toMap(x -> x.getId(), x -> x));
 		Map<Integer, List<CustomRetailer>> positionIdRetailerMap = csService.getPositionCustomRetailerMap(positions);
 		for (Position position : positions) {
 			List<CustomRetailer> crList = positionIdRetailerMap.get(position.getId());
-			if (crList == null)
+			if(crList==null) continue;
-				continue;
 			for (CustomRetailer cr : crList) {
 				if (!partnerEmailSalesMap.containsKey(cr.getEmail())) {
 					partnerEmailSalesMap.put(cr.getEmail(), new SaleRoles());
+				}
 				SaleRoles saleRoles = partnerEmailSalesMap.get(cr.getEmail());
 		Map<Integer, CustomRetailer> customRetailerMap = retailerService
 				.getFofoRetailers(new ArrayList<>(fofoStoresMap.keySet()));
 		Map<String, CustomRetailer> customRetailerEmailMap = customRetailerMap.values().stream()
 				.collect(Collectors.toMap(x -> x.getEmail(), x -> x));
 		Map<String, SaleRoles> partnerEmailSalesMap = this.getPartnerEmailSalesMap();
 		List<String> headers = Arrays.asList("Code", "Firm Name", "Store Name", "Current Category", "State Manager",
 				"Teritory Manager", "Team Leader", "Targeted Category", "Targeted Value", "Target Achieved",
 				"Achived Percentage", "Remaining Target", "Today's Target", "Today's achievement");
 			FofoStore fofoStore = fofoStoresMap.get(retailer.getPartnerId());
 			Serializable code = fofoStore.getCode();
 			Serializable storeName = "SmartDukaan-" + fofoStore.getCode().replaceAll("[a-zA-Z]", "");
 			Serializable businessName = retailer.getBusinessName();
 			try {
-				Serializable stateManager = StringUtils.join(partnerEmailSalesMap.get(retailer.getEmail()).getL2(),
+				Serializable stateManager = StringUtils.join(partnerEmailSalesMap.get(retailer.getEmail()).getL2(), ", ");
-						", ");
-				Serializable territoryManager = StringUtils.join(partnerEmailSalesMap.get(retailer.getEmail()).getL1(),
+				Serializable territoryManager = StringUtils.join(partnerEmailSalesMap.get(retailer.getEmail()).getL1(), ", ");
-						", ");
 				List<Serializable> row = new ArrayList<>(
 						Arrays.asList(code, businessName, storeName, stateManager, territoryManager));
 				if (partnerSalesTargetRowsMap.get(retailer.getEmail()) != null) {
 					row.addAll(partnerSalesTargetRowsMap.get(retailer.getEmail()));
 					partnerRowMap.put(retailer.getEmail(), row);
 				attachment1);
 		// Reports to be sent to mapped partners
 		Map<String, Set<String>> storeGuysMap = csService.getAuthUserPartnerEmailMapping();
-		Utils.sendMailWithAttachments(googleMailSender, storeGuysMap.keySet().toArray(new String[0]), null,
+		Utils.sendMailWithAttachments(googleMailSender, storeGuysMap.keySet().toArray(new String[0]), null, "Stock Aeging Report", "PFA", attachment);
-				"Stock Aeging Report", "PFA", attachment);
 		for (Map.Entry<String, Set<String>> storeGuyEntry : storeGuysMap.entrySet()) {
 			Map<String, String> params = new HashMap<>();
 			if (storeGuyEntry.getValue().size() == 0)
 				continue;

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 25603 → 25604