Skip to content

B
business-java
Commit cc9cb67e authored by pborate's avatar pborate
Browse files
Options

Updated changes in planVsActual ejb 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188941 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e893a034
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 13 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ cc9cb67e
......@@ -1828,15 +1828,17 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
rawDataPlanDtlJson.put("ACTIVITY_END_LOCALITY",sourceDestination.get("ACTIVITY_END_LOCALITY"));
System.out.println("after rawDataPlanDtlJson 1 "+rawDataPlanDtlJson);
JSONObject countListed=countOfListedUnlisted(salePersons,currentDate,dataSourceName,targetDateFormat);
org.json.JSONObject countListed=countOfListedUnlisted(salePersons,currentDate,dataSourceName,targetDateFormat);
System.out.println("after countListed "+countListed);
rawDataPlanDtlJson.put("TODAYS_SUMMARY",countListed.get("TODAYS_SUMMARY"));
rawDataPlanDtlJson.put("VISIT_SUMMARY",countListed.get("VISIT_SUMMARY"));
System.out.println("after rawDataPlanDtlJson 2"+rawDataPlanDtlJson);
String unListedDocList=countListed.getString("UNLISTED_DOC_STR");
org.json.JSONArray doctorArray=new org.json.JSONArray();
doctorArray=getTodaysCallData(salePersons,currentDate,dataSourceName,targetDateFormat);
doctorArray=getTodaysCallData(salePersons,currentDate,dataSourceName,targetDateFormat,unListedDocList);
System.out.println("after doctorArray 1::: "+doctorArray);
doctorArray=getDoctorAryLoc(doctorArray);
System.out.println("after doctorArray 2"+doctorArray);
......@@ -1898,6 +1900,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorarryObj.put("CUST_NAME", doctorObject.optString("CUST_NAME"));
doctorarryObj.put("CUST_TYPE", doctorObject.optString("CUST_TYPE"));
doctorarryObj.put("CUST_TYPE_DESCR", doctorObject.getString("CUST_TYPE_DESCR"));
doctorarryObj.put("LISTED", doctorObject.optString("LISTED"));
existingDocArray.put(doctorarryObj);
doctorFinalArray.getJSONObject(j).put("CUSTOMERS", existingDocArray);
localityFound = true;
......@@ -1914,6 +1918,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorarryObj.put("CUST_NAME", doctorObject.optString("CUST_NAME"));
doctorarryObj.put("CUST_TYPE", doctorObject.optString("CUST_TYPE"));
doctorarryObj.put("CUST_TYPE_DESCR", doctorObject.getString("CUST_TYPE_DESCR"));
doctorarryObj.put("LISTED", doctorObject.optString("LISTED"));
newDocArray.put(doctorarryObj);
doctorObjectNew.put("CUSTOMERS", newDocArray);
......@@ -2002,12 +2007,12 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
}
private JSONObject countOfListedUnlisted(String salePersons,String currentDate,String dataSourceName,String targetDateFormat)throws Exception {
private org.json.JSONObject countOfListedUnlisted(String salePersons,String currentDate,String dataSourceName,String targetDateFormat)throws Exception {
System.out.println("Inside getSourceDestination : "+salePersons);
JSONObject listOfCount=new JSONObject();
JSONArray finalArray=new JSONArray();
JSONArray visitSummeryArray=new JSONArray();
JSONObject visitObj=new JSONObject();
org.json.JSONObject visitObj=new org.json.JSONObject();
JSONArray todaySummeryArray=new JSONArray();
String sql = "";
ResultSet rs = null;
......@@ -2111,7 +2116,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
pstmt = null;
sql = "SELECT 'ULNISTED' AS ULNISTED," +
" COUNT(*) AS COUNT" +
" NVL(SM.STRG_CODE,'NA') AS STRG_CODE" +
" FROM STRG_MEET SM" +
" LEFT JOIN STRG_CUSTOMER SC" +
" ON SC.SC_CODE = SM.STRG_CODE" +
......@@ -2131,16 +2136,19 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery();
String ScCodeStr="";
while(rs.next())
{
visitSummerObj=new JSONObject();
unlisted=Integer.parseInt(rs.getString("COUNT"));
visitSummerObj.put("OPTION_NAME", "Unlisted");
visitSummerObj.put("OPTION_VALUE", unlisted);
String scCode=rs.getString("STRG_CODE");
ScCodeStr=ScCodeStr+","+scCode;
unlisted=unlisted+1;
visitSummeryArray.add(visitSummerObj);
}
System.out.println("scCode str ["+ScCodeStr+"] unlisted count ["+unlisted+"]");
visitSummerObj=new JSONObject();
visitSummerObj.put("OPTION_NAME", "Unlisted");
visitSummerObj.put("OPTION_VALUE", unlisted);
visitSummeryArray.add(visitSummerObj);
System.out.println("countOfListedUnlisted 2 visitSummeryArray "+visitSummeryArray);
visitObj.put("VISIT_SUMMARY", visitSummeryArray);
......@@ -2151,6 +2159,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
JSONObject todaysSummyObj=new JSONObject();
visitObj.put("TODAYS_SUMMARY", todaySummeryArray);
visitObj.put("UNLISTED_DOC_STR", ScCodeStr);
//finalArray.add(todaysSummyObj);
//finalArray.add(visitObj);
......@@ -2165,7 +2175,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
return visitObj;
}
private org.json.JSONArray getTodaysCallData(String salePersons,String currentDate,String dataSourceName,String targetDateFormat) throws Exception{
private org.json.JSONArray getTodaysCallData(String salePersons,String currentDate,String dataSourceName,String targetDateFormat,String unListedDocList) throws Exception{
System.out.println("Inside getTodaysCallData ");
String sql = "";
ResultSet rs = null;
......@@ -2237,18 +2247,28 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
" ) " +
" ) " +
"ORDER BY locality, TIME_SORT, START_TIME ";
System.out.println("getTodaysCallData sql "+sql);
System.out.println("getTodaysCallData sql "+sql);
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery();
while(rs.next())
{
JSONObject doctorObject=new JSONObject();
String scCode=rs.getString("SC_CODE");
doctorObject.put("EVENT_TIME", checkNull(rs.getString("START_TIME")));
doctorObject.put("LOCALITY", checkNull(rs.getString("Locality")));
doctorObject.put("CUST_NAME", checkNull(rs.getString("STRG_NAME")));
doctorObject.put("CUST_TYPE", checkNull(rs.getString("STRG_TYPE")));
doctorObject.put("CUST_TYPE_DESCR", checkNull(rs.getString("SH_DESCR")));
System.out.println("sc code "+scCode);
if(unListedDocList.indexOf(scCode) == -1 )
{
doctorObject.put("LISTED", "Y");
}
else
{
doctorObject.put("LISTED", "N");
}
doctorArray.put(doctorObject);
System.out.println("getTodaysCallData dcotor obj "+doctorObject);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment