Skip to content

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

Updated changes for todays call dashboard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@195498 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ff6e09ad
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 91 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ f43224cf
......@@ -70,12 +70,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
//Added by Anjali R.[End]
//Added by Saitej D [START]
public String getTodaysData(String dataSourceName,String loginId,String salePersons,String dummy,String eventDate)throws Exception
public String getTodaysData(String dataSourceName,String loginId,String salePersons,String dummy,String fromDate, String toDate)throws Exception
{
System.out.println("getTodaysCalls==========\n dataSourceName-["+dataSourceName+"]loginId-["+loginId+"]salePersons-["+salePersons+"]");
//System.out.println("Result ---3["+getTodaysCalls(dataSourceName, loginId, salePersons).toJSONString()+"]");
//return getTodaysCalls(dataSourceName, loginId, salePersons).toString();
return getTodaysMyData(dataSourceName, loginId, salePersons,eventDate).toString();
return getTodaysMyData(dataSourceName, loginId, salePersons,fromDate, toDate).toString();
}
//Added by Saitej D [END]
......@@ -2078,7 +2078,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
//Added by Priyanka B. [Todays Calls Dashboard] Start
public org.json.JSONObject getTodaysMyData(String dataSourceName,String loginCode,String salePersons,String eventDate) throws Exception
public org.json.JSONObject getTodaysMyData(String dataSourceName,String loginCode,String salePersons,String fromDate, String toDate) throws Exception
{
System.out.println("inside getTodaysMyData "+dataSourceName);
......@@ -2095,40 +2095,51 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
StringBuffer listedBuffer = new StringBuffer();
int planned=0, unplanned=0,listed=0, unListed=0;
int totalCalls=0;
String currentDate="";
//String currentDate="";
org.json.JSONArray optionArray =new org.json.JSONArray();
String validFromDate;
String validToDate;
try
{
salePersons = salePersons == null ? "": salePersons.trim();
dashboardUtility = new DashboardUtility();
SimpleDateFormat sdf = new SimpleDateFormat(e12GenUtility.getApplDateFormat());
currentDate = sdf.format(new java.util.Date());
currentDate=e12GenUtility.getValidDateString(currentDate, sourceDateFormat, targetDateFormat);
validFromDate = sdf.format(new java.util.Date());
validFromDate=e12GenUtility.getValidDateString(validFromDate, sourceDateFormat, targetDateFormat);
if(eventDate != null) {
System.out.println("Inside event data not null ["+eventDate+"] sourceDateFormat ["+sourceDateFormat+"] targetDateFormat ["+targetDateFormat+"]");
eventDate=e12GenUtility.getValidDateString(eventDate, sourceDateFormat, targetDateFormat);
currentDate=eventDate;
validToDate = sdf.format(new java.util.Date());
validToDate=e12GenUtility.getValidDateString(validToDate, sourceDateFormat, targetDateFormat);
if(fromDate != null) {
System.out.println("Inside event data not null ["+fromDate+"] sourceDateFormat ["+sourceDateFormat+"] targetDateFormat ["+targetDateFormat+"]");
fromDate=e12GenUtility.getValidDateString(fromDate, sourceDateFormat, targetDateFormat);
validFromDate=fromDate;
}
if(toDate != null) {
System.out.println("Inside event data not null ["+toDate+"] sourceDateFormat ["+sourceDateFormat+"] targetDateFormat ["+targetDateFormat+"]");
toDate=e12GenUtility.getValidDateString(toDate, sourceDateFormat, targetDateFormat);
validToDate=toDate;
}
System.out.println("getTodaysMyData >>>>>>> salePersons: "+salePersons+" loginCode: "+loginCode+" currentDate: "+currentDate);
System.out.println("getTodaysMyData >>>>>>> salePersons: "+salePersons+" loginCode: "+loginCode+" validFromDate: "+validFromDate+" validToDate: "+validToDate);
if(salePersons == null || salePersons.length()==0)
{
salePersons = loginCode;
}
salePersons = dashboardUtility.getCommaSeparated(salePersons);
JSONObject sourceDestination=getSourceDestination(salePersons,currentDate,dataSourceName,targetDateFormat);
System.out.println("after sourceDestination "+sourceDestination);
rawDataPlanDtlJson.put("EVENT_DATE",currentDate);
rawDataPlanDtlJson.put("CALL_RESULT","1");
rawDataPlanDtlJson.put("CALL_RESULT_DESCR","As per plan");
rawDataPlanDtlJson.put("ACTIVITY_START_LOCALITY",sourceDestination.get("ACTIVITY_START_LOCALITY"));
rawDataPlanDtlJson.put("ACTIVITY_END_LOCALITY",sourceDestination.get("ACTIVITY_END_LOCALITY"));
//JSONObject sourceDestination=getSourceDestination(salePersons,currentDate,dataSourceName,targetDateFormat);
//System.out.println("after sourceDestination "+sourceDestination);
//rawDataPlanDtlJson.put("EVENT_DATE",currentDate);
//rawDataPlanDtlJson.put("CALL_RESULT","1");
//rawDataPlanDtlJson.put("CALL_RESULT_DESCR","As per plan");
//rawDataPlanDtlJson.put("ACTIVITY_START_LOCALITY",sourceDestination.get("ACTIVITY_START_LOCALITY"));
//rawDataPlanDtlJson.put("ACTIVITY_END_LOCALITY",sourceDestination.get("ACTIVITY_END_LOCALITY"));
System.out.println("after rawDataPlanDtlJson 1 "+rawDataPlanDtlJson);
org.json.JSONObject countListed=countOfListedUnlisted(salePersons,currentDate,dataSourceName,targetDateFormat);
org.json.JSONObject countListed=countOfListedUnlisted(salePersons,validFromDate,validToDate,dataSourceName,targetDateFormat);
System.out.println("after countListed "+countListed);
rawDataPlanDtlJson.put("TODAYS_SUMMARY",countListed.get("TODAYS_SUMMARY"));
......@@ -2138,11 +2149,12 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
String unListedDocList=countListed.getString("UNLISTED_DOC_STR");
org.json.JSONArray doctorArray=new org.json.JSONArray();
doctorArray=getTodaysCallData(salePersons,currentDate,dataSourceName,targetDateFormat,unListedDocList);
doctorArray=getTodaysCallData(salePersons,validFromDate,validToDate,dataSourceName,targetDateFormat,unListedDocList);
System.out.println("after doctorArray 1::: "+doctorArray);
doctorArray=getDoctorAryLoc(doctorArray);
System.out.println("after doctorArray 2"+doctorArray);
rawDataPlanDtlJson.put("TODAYS_CALL",doctorArray);
//rawDataPlanDtlJson.put("TODAYS_CALL",doctorArray);
rawDataPlanDtlJson.put("CALL_DETAILS",doctorArray);
System.out.println("final result "+rawDataPlanDtlJson);
......@@ -2157,9 +2169,14 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
return rawDataPlanDtlJson;
}
private org.json.JSONArray getDoctorAryLoc(org.json.JSONArray doctorArray) throws JSONException {
private org.json.JSONArray getDoctorAryLoc(org.json.JSONArray doctorArray) throws ITMException, Exception {
// TODO Auto-generated method stub
org.json.JSONArray doctorFinalArray =new org.json.JSONArray();
org.json.JSONArray callsFinalArray =new org.json.JSONArray();
HashMap<String, org.json.JSONArray> finalCallsMap = new HashMap<String, org.json.JSONArray>();
E12GenericUtility e12GenUtility = new E12GenericUtility();
String targetDateFormat = e12GenUtility.getApplDateFormat();
System.out.println("Inside getDoctorAryLoc"+doctorArray);
if(doctorArray != null) {
for(int i = 0; i < doctorArray.length(); i++) {
......@@ -2167,10 +2184,15 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
org.json.JSONObject doctorObjectNew =new org.json.JSONObject();
System.out.println("json doctor object "+doctorObject);
String locality=doctorObject.optString("LOCALITY");
String eventDate = doctorObject.optString("EVENT_DATE");
boolean localityFound = false;
org.json.JSONObject locationJsonObj = new org.json.JSONObject();
for(int j = 0; j < doctorFinalArray.length(); j++) {
org.json.JSONObject doctorObject1 = doctorFinalArray.getJSONObject(j);
if(doctorObject1.optString("LOCALITY").equalsIgnoreCase(locality)) {
if(doctorObject1.optString("LOCALITY").equalsIgnoreCase(locality) && doctorObject1.optString("EVENT_DATE").equalsIgnoreCase(eventDate)) {
System.out.println("In localityFound");
org.json.JSONArray existingDocArray = doctorObject1.getJSONArray("CUSTOMERS");
org.json.JSONObject doctorarryObj =new org.json.JSONObject();
doctorarryObj.put("EVENT_TIME", doctorObject.optString("EVENT_TIME"));
......@@ -2179,6 +2201,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorarryObj.put("CUST_TYPE_DESCR", doctorObject.getString("CUST_TYPE_DESCR"));
doctorarryObj.put("LISTED", doctorObject.optString("LISTED"));
doctorarryObj.put("CUST_CODE", doctorObject.optString("CUST_CODE"));
doctorarryObj.put("STATUS", doctorObject.optString("STATUS"));
existingDocArray.put(doctorarryObj);
doctorFinalArray.getJSONObject(j).put("CUSTOMERS", existingDocArray);
......@@ -2187,6 +2210,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
}
if(!localityFound) {
System.out.println("In NOT localityFound");
org.json.JSONArray newDocArray =new org.json.JSONArray();
org.json.JSONObject doctorarryObj =new org.json.JSONObject();
doctorObjectNew.put("LOCALITY", doctorObject.optString("LOCALITY"));
......@@ -2198,16 +2223,57 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorarryObj.put("CUST_TYPE_DESCR", doctorObject.getString("CUST_TYPE_DESCR"));
doctorarryObj.put("LISTED", doctorObject.optString("LISTED"));
doctorarryObj.put("CUST_CODE", doctorObject.optString("CUST_CODE"));
doctorarryObj.put("STATUS", doctorObject.optString("STATUS"));
newDocArray.put(doctorarryObj);
doctorObjectNew.put("CUSTOMERS", newDocArray);
doctorObjectNew.put("CUSTOMERS", newDocArray);
String event_date = doctorObject.optString("EVENT_DATE");
try {
event_date = e12GenUtility.getValidDateString(event_date, "yyyy-mm-dd hh:mm:ss", targetDateFormat);
}
catch(Exception e) {
System.out.println("Exception in getDoctorAryLoc method"+e);
}
doctorObjectNew.put("EVENT_DATE", event_date);
doctorFinalArray.put(doctorObjectNew);
}
}
System.out.println("doctorFinalArray >>>>>> "+doctorFinalArray);
for(int i = 0; i < doctorFinalArray.length(); i++)
{
org.json.JSONObject locationsObj = doctorFinalArray.getJSONObject(i);
String eventDate = locationsObj.optString("EVENT_DATE");
boolean isEventDateExists = false;
System.out.println("callsFinalArray In LOOP "+callsFinalArray);
for(int j = 0; j < callsFinalArray.length(); j++)
{
org.json.JSONObject finalLocJson = callsFinalArray.getJSONObject(j);
org.json.JSONArray existingLocations = finalLocJson.getJSONArray("PLACES");
if(finalLocJson != null && eventDate.equals(finalLocJson.optString("EVENT_DATE")))
{
existingLocations.put(locationsObj);
callsFinalArray.getJSONObject(j).put("PLACES", existingLocations);
isEventDateExists = true;
}
}
if(!isEventDateExists)
{
org.json.JSONObject newLocObj =new org.json.JSONObject();
org.json.JSONArray newLocations = new org.json.JSONArray();
newLocations.put(locationsObj);
newLocObj.put("EVENT_DATE", eventDate);
newLocObj.put("PLACES", newLocations);
callsFinalArray.put(newLocObj);
}
}
System.out.println("callsFinalArray >>>>>> "+callsFinalArray);
}
return doctorFinalArray;
return callsFinalArray;
}
private JSONObject getSourceDestination(String salePersons,String currentDate,String dataSourceName,String targetDateFormat)throws Exception {
......@@ -2318,7 +2384,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
}
private org.json.JSONObject countOfListedUnlisted(String salePersons,String currentDate,String dataSourceName,String targetDateFormat)throws Exception {
private org.json.JSONObject countOfListedUnlisted(String salePersons,String validFromDate, String validToDate, String dataSourceName,String targetDateFormat)throws Exception {
System.out.println("Inside getSourceDestination : "+salePersons);
JSONObject listOfCount=new JSONObject();
JSONArray finalArray=new JSONArray();
......@@ -2351,7 +2417,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
" ON SC.SC_CODE=SM.STRG_CODE ," +
" STRG_CUST_TYPE SCT" +
" WHERE SM.SALES_PERS = "+salePersons+"" +
" AND SM.EVENT_DATE = TO_DATE('"+currentDate+"','" +targetDateFormat+"')"+
" AND SM.EVENT_DATE BETWEEN TO_DATE('"+validFromDate+"','" +targetDateFormat+"')"+
" AND TO_DATE('"+validToDate+"','" +targetDateFormat+"')"+
" AND SS.STATUS ='Y'" +
" AND SM.EVENT_TYPE NOT IN" +
" ("+
......@@ -2421,7 +2488,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
" INNER JOIN SALES_PERS SP" +
" ON SP.SALES_PERS =SM.SALES_PERS" +
" WHERE SM.SALES_PERS="+salePersons+"" +
" AND SM.EVENT_DATE =TO_DATE('"+currentDate+"','" +targetDateFormat+"')"+
" AND SM.EVENT_DATE BETWEEN TO_DATE('"+validFromDate+"','" +targetDateFormat+"')"+
" AND TO_DATE('"+validToDate+"','" +targetDateFormat+"')"+
" AND NOT EXISTS" +
" ( "+
" SELECT STRG_CODE FROM STRG_MEET SM WHERE SC.SC_CODE = SM.STRG_CODE" +
......@@ -2503,7 +2571,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
return visitObj;
}
private org.json.JSONArray getTodaysCallData(String salePersons,String currentDate,String dataSourceName,String targetDateFormat,String unListedDocList) throws Exception{
private org.json.JSONArray getTodaysCallData(String salePersons,String validFromDate,String validToDate,String dataSourceName,String targetDateFormat,String unListedDocList) throws Exception{
System.out.println("Inside getTodaysCallData ");
String sql = "";
ResultSet rs = null;
......@@ -2519,69 +2587,150 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
try {
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
sql = "SELECT SM.STRG_CODE AS SC_CODE, " +
" SM.STRG_NAME AS STRG_NAME, " +
" LOC.DESCR AS Locality, " +
" SCT.SH_DESCR, " +
" (SM.STRG_TYPE) AS STRG_TYPE, " +
" (SM.EVENT_TIME_START) AS START_TIME, " +
" CASE WHEN INSTR(SM.EVENT_TIME_START, 'A') > 0 THEN 1 ELSE 2 END AS TIME_SORT " +
"FROM STRG_MEET SM " +
"INNER JOIN SALES_PERS SP " +
"ON SP.SALES_PERS = SM.SALES_PERS, " +
" STRG_CUST_TYPE SCT, " +
" LOCALITY LOC " +
"WHERE SM.SALES_PERS = "+salePersons+" " +
"AND SM.EVENT_DATE = TO_DATE('"+currentDate+"','" +targetDateFormat+"')"+
"AND SM.EVENT_TYPE NOT IN " +
" (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " +
" ) " +
"AND SCT.TYPE = SM.STRG_TYPE " +
"AND SM.LOCALITY_CODE = LOC.LOCALITY_CODE " +
"UNION ALL " +
"SELECT SPC.SC_CODE AS SC_CODE, " +
" SC.FIRST_NAME " +
" || ' ' " +
" || SC.LAST_NAME AS STRG_NAME, " +
" LOC.DESCR AS Locality, " +
" 'MISSED' AS SH_DESCR, " +
" SC.CUST_TYPE AS STRG_TYPE, " +
" (SPC.PLAN_TIME_START) AS START_TIME, " +
" CASE WHEN INSTR(SPC.PLAN_TIME_START, 'A') > 0 THEN 1 ELSE 2 END AS TIME_SORT " +
"FROM SPRS_PLAN_HDR SPH " +
"INNER JOIN SPRS_PLAN_CUST SPC " +
"ON SPC.PLAN_ID = SPH.PLAN_ID " +
"INNER JOIN SALES_PERS SP " +
"ON SP.SALES_PERS = SPH.SPRS_CODE__PLAN " +
"INNER JOIN STRG_CUSTOMER SC " +
"ON SPC.SC_CODE = SC.SC_CODE, " +
" LOCALITY LOC " +
"WHERE PLAN_DATE =TO_DATE('"+currentDate+"','" +targetDateFormat+"')"+
"AND SPH.SPRS_CODE__PLAN ="+salePersons+" " +
"AND SPH.CONFIRM ='Y' " +
"AND SPH.PLAN_ACTIVITY NOT IN " +
" (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " +
" ) " +
"AND LOC.LOCALITY_CODE = TRIM(SPC.LOCALITY_CODE) " +
"AND SPC.SC_CODE NOT IN " +
" (SELECT SM.STRG_CODE " +
" FROM STRG_MEET SM " +
" INNER JOIN SALES_PERS SP " +
" ON SP.SALES_PERS = SM.SALES_PERS " +
" WHERE SM.SALES_PERS = "+salePersons+" " +
" AND SM.EVENT_DATE = TO_DATE('"+currentDate+"','" +targetDateFormat+"')"+
" AND SM.EVENT_TYPE NOT IN " +
" (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " +
" ) " +
" ) " +
"ORDER BY locality, TIME_SORT, START_TIME ";
//Updated by Priyanka B on 9/01/19 start
sql="SELECT SM.STRG_CODE AS SC_CODE, " +
" SM.STRG_NAME AS STRG_NAME," +
" LOC.DESCR AS Locality, " +
" SCT.SH_DESCR, " +
" 'UNPLANNED' AS STATUS, " +
" (SM.STRG_TYPE) AS STRG_TYPE, " +
" (SM.EVENT_TIME_START) AS START_TIME, " +
" CASE " +
" WHEN INSTR(SM.EVENT_TIME_START, 'A') > 0 " +
" THEN 1 " +
" ELSE 2 " +
" END AS TIME_SORT, " +
" SM.EVENT_DATE " +
"FROM STRG_MEET SM " +
"INNER JOIN SALES_PERS SP " +
"ON SP.SALES_PERS = SM.SALES_PERS, " +
" STRG_CUST_TYPE SCT, " +
" LOCALITY LOC " +
"WHERE SM.SALES_PERS IN("+salePersons+") " +
"AND SM.EVENT_DATE BETWEEN TO_DATE('"+validFromDate+"','" +targetDateFormat+"') " +
"AND TO_DATE('"+validToDate+"','" +targetDateFormat+"') "+
"AND SM.EVENT_TYPE NOT IN " +
" (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " +
" ) " +
"AND SCT.TYPE = SM.STRG_TYPE " +
"AND SM.LOCALITY_CODE = LOC.LOCALITY_CODE " +
"AND SM.STRG_CODE NOT IN " +
" (SELECT SPC.SC_CODE " +
" FROM SALES_PERS SP " +
" INNER JOIN SPRS_PLAN_HDR SPH " +
" ON SP.SALES_PERS=SPH.SPRS_CODE__PLAN " +
" INNER JOIN SPRS_PLAN_CUST SPC " +
" ON SPH.PLAN_ID=SPC.PLAN_ID " +
" INNER JOIN STRG_CUSTOMER SC " +
" ON SC.SC_CODE=SPC.SC_CODE " +
" INNER JOIN LOCALITY L " +
" ON L.LOCALITY_CODE=SC.LOCALITY_CODE " +
" INNER JOIN STRG_SERIES SS " +
" ON SS.SC_CODE =SC.SC_CODE " +
" WHERE SPH.PLAN_DATE = SM.EVENT_DATE " +
" AND SP.SALES_PERS IN("+salePersons+") " +
" ) " +
"UNION ALL " +
"SELECT SM.STRG_CODE AS SC_CODE, " +
" SM.STRG_NAME AS STRG_NAME, " +
" LOC.DESCR AS LOCALITY, " +
" SCT.SH_DESCR AS SH_DESCR, " +
" 'PLANNED' AS STATUS, " +
" (SM.STRG_TYPE) AS STRG_TYPE, " +
" (SM.EVENT_TIME_START) AS START_TIME, " +
" CASE " +
" WHEN INSTR(SM.EVENT_TIME_START, 'A') > 0 " +
" THEN 1 " +
" ELSE 2 " +
" END AS TIME_SORT, " +
" SM.EVENT_DATE " +
"FROM SALES_PERS SP " +
"INNER JOIN STRG_MEET SM " +
"ON SP.SALES_PERS=SM.SALES_PERS " +
"INNER JOIN STRG_CUSTOMER SC " +
"ON SC.SC_CODE=SM.STRG_CODE " +
"INNER JOIN LOCALITY LOC " +
"ON LOC.LOCALITY_CODE=SC.LOCALITY_CODE " +
"INNER JOIN STRG_SERIES SS " +
"ON SS.SC_CODE=SC.SC_CODE , " +
" STRG_CUST_TYPE SCT " +
"WHERE SM.EVENT_DATE BETWEEN TO_DATE('"+validFromDate+"','" +targetDateFormat+"') " +
"AND TO_DATE('"+validToDate+"','" +targetDateFormat+"') "+
"AND SP.SALES_PERS IN("+salePersons+") " +
"AND SCT.TYPE = SM.STRG_TYPE " +
"AND SS.SALES_PERS = SP.SALES_PERS " +
"AND SM.STRG_CODE IN " +
" (SELECT SPC.SC_CODE " +
" FROM SALES_PERS SP " +
" INNER JOIN SPRS_PLAN_HDR SPH " +
" ON SP.SALES_PERS=SPH.SPRS_CODE__PLAN " +
" INNER JOIN SPRS_PLAN_CUST SPC " +
" ON SPH.PLAN_ID=SPC.PLAN_ID " +
" INNER JOIN STRG_CUSTOMER SC " +
" ON SC.SC_CODE=SPC.SC_CODE " +
" INNER JOIN LOCALITY L " +
" ON L.LOCALITY_CODE=SC.LOCALITY_CODE " +
" INNER JOIN STRG_SERIES SS " +
" ON SS.SC_CODE =SC.SC_CODE " +
" WHERE SPH.PLAN_DATE = SM.EVENT_DATE " +
" AND SP.SALES_PERS IN("+salePersons+") " +
" ) " +
"UNION ALL " +
"SELECT SPC.SC_CODE AS SC_CODE, " +
" SC.FIRST_NAME " +
" || ' ' " +
" || SC.LAST_NAME AS STRG_NAME, " +
" LOC.DESCR AS Locality, " +
" '' AS SH_DESCR, " +
" 'MISSED' AS STATUS, " +
" SC.CUST_TYPE AS STRG_TYPE, " +
" (SPC.PLAN_TIME_START) AS START_TIME, " +
" CASE " +
" WHEN INSTR(SPC.PLAN_TIME_START, 'A') > 0 " +
" THEN 1 " +
" ELSE 2 " +
" END AS TIME_SORT, " +
" PLAN_DATE " +
"FROM SPRS_PLAN_HDR SPH " +
"INNER JOIN SPRS_PLAN_CUST SPC " +
"ON SPC.PLAN_ID = SPH.PLAN_ID " +
"INNER JOIN SALES_PERS SP " +
"ON SP.SALES_PERS = SPH.SPRS_CODE__PLAN " +
"INNER JOIN STRG_CUSTOMER SC " +
"ON SPC.SC_CODE = SC.SC_CODE, " +
" LOCALITY LOC " +
"WHERE PLAN_DATE BETWEEN TO_DATE('"+validFromDate+"','" +targetDateFormat+"') " +
" AND TO_DATE('"+validToDate+"','" +targetDateFormat+"')"+
"AND SPH.SPRS_CODE__PLAN IN("+salePersons+") " +
"AND SPH.CONFIRM ='Y' " +
"AND SPH.PLAN_ACTIVITY NOT IN " +
" (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " +
" ) " +
"AND LOC.LOCALITY_CODE = SPC.LOCALITY_CODE " +
"AND SPC.SC_CODE NOT IN " +
" (SELECT SM.STRG_CODE " +
" FROM STRG_MEET SM " +
" INNER JOIN SALES_PERS SP " +
" ON SP.SALES_PERS = SM.SALES_PERS " +
" WHERE SM.SALES_PERS IN("+salePersons+") " +
" AND SM.EVENT_DATE = PLAN_DATE "+
" AND SM.EVENT_TYPE NOT IN " +
" (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR' " +
" ) " +
" ) " +
"ORDER BY locality, " +
" TIME_SORT, " +
" START_TIME " +
" ";
//Updated by Priyanka B on 9/01/19 end
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();
org.json.JSONObject doctorObject=new org.json.JSONObject();
String scCode=rs.getString("SC_CODE");
doctorObject.put("EVENT_TIME", checkNull(rs.getString("START_TIME")));
doctorObject.put("LOCALITY", checkNull(rs.getString("Locality")));
......@@ -2589,6 +2738,9 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorObject.put("CUST_TYPE", checkNull(rs.getString("STRG_TYPE")));
doctorObject.put("CUST_TYPE_DESCR", checkNull(rs.getString("SH_DESCR")));
doctorObject.put("CUST_CODE", checkNull(rs.getString("SC_CODE")));
doctorObject.put("EVENT_DATE", checkNull(rs.getString("EVENT_DATE")));
doctorObject.put("STATUS", checkNull(rs.getString("STATUS")));
System.out.println("sc code "+scCode);
if(unListedDocList.indexOf(scCode) == -1 )
......
webitm-dashboard/ibase/dashboard/sfa/servlet/TodaysServlet.java
View file @ f43224cf
......@@ -54,8 +54,10 @@ public class TodaysServlet extends HttpServlet
System.out.println("loginId = "+loginId+ "sales person = "+salePersons);
//dataSourceName = request.getParameter("dataSourceName");
selectedOption = request.getParameter("viewOptionSelectd");
eventDate=request.getParameter("eventDate");
System.out.println("dataSourceName ["+dataSourceName+"] eventDate ["+eventDate+"]");
//eventDate=request.getParameter("eventDate");
fromDate=request.getParameter("fromDate");
toDate=request.getParameter("toDate");
System.out.println("dataSourceName ["+dataSourceName+"] fromDate ["+fromDate+"] toDate["+toDate+"]");
//Commented and added By Varsha V on 06-08-18 for removing lookup
//context = new InitialContext(appConnectParm.getProperty());
System.out.println("lookup 111111");
......@@ -65,7 +67,7 @@ public class TodaysServlet extends HttpServlet
//jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons);
//jsonObjData = planvsactualRemote.getTodaysCalls(dataSourceName,loginId,salePersons,"",eventDate);
planVsActual = new PlanVsActual();
jsonObjData = planVsActual.getTodaysData(dataSourceName,loginId,salePersons,"",eventDate);
jsonObjData = planVsActual.getTodaysData(dataSourceName,loginId,salePersons,"",fromDate, toDate);
System.out.println(" Final data set for TodaysCallServlet build the Graph is===" + jsonObjData);
......
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