Updated account activity dao

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@181653 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java

@@ -60,19 +60,20 @@ public class AccountActivityDao
 		JSONObject activityDataFinal = new JSONObject();
 		JSONArray activityDataFinalArray = new JSONArray();
 		profileId=profileId.trim();
-
 		String format1="yyyyMMdd";
 		List<String> dateListFile= genUtil.getDateList(fromDate,toDate,sourceDateFormat,format1);
 		
-		SimpleDateFormat app = new SimpleDateFormat(genericUtility.getApplDateFormat());
-		SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
-		
-		Date startDate = (Date) app.parse(fromDate);
-		Date endDate = (Date) app.parse(toDate);
+//		SimpleDateFormat app = new SimpleDateFormat(genericUtility.getApplDateFormat());
+//		SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
+//		
+//		Date startDate = (Date) app.parse(fromDate);
+//		Date endDate = (Date) app.parse(toDate);
+//		
+//		fromDate=sdf.format(startDate);
+//		toDate=sdf.format(endDate);
 		
-		fromDate=sdf.format(startDate);
-		toDate=sdf.format(endDate);
-			
+		fromDate=genericUtility.getValidDateString(fromDate, sourceDateFormat, targetDateFormat);
+		toDate=genericUtility.getValidDateString(toDate, sourceDateFormat, targetDateFormat);
 
 		System.out.println("fromDate :::::["+fromDate+"] toDate ["+toDate+"] startBattery ["+startBattery+"]");