Skip to content

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

Updated to format date in Application Date Format 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@195265 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 370d0387
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 5 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ 340183b8
...@@ -109,12 +109,16 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -109,12 +109,16 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
connDriver = null; connDriver = null;
formatter = new SimpleDateFormat("dd-MMM-yy"); formatter = new SimpleDateFormat("dd-MMM-yy");
HashMap<String, ArrayList<String>> planHashMap = new HashMap<String, ArrayList<String>>(); HashMap<String, ArrayList<String>> planHashMap = new HashMap<String, ArrayList<String>>();
String sourceDateFormat=e12GenericUtility.getApplDateFormat();
String targetDateFormat=e12GenericUtility.getDBDateFormat();
ArrayList<String> docList = new ArrayList<String>(); ArrayList<String> docList = new ArrayList<String>();
//HashMap<String, HashMap<String, ArrayList<String>>> finalMap = new HashMap<String, HashMap<String,ArrayList<String>>>(); //HashMap<String, HashMap<String, ArrayList<String>>> finalMap = new HashMap<String, HashMap<String,ArrayList<String>>>();
TreeMap<String, HashMap<String, ArrayList<String>>> finalMap = new TreeMap<String, HashMap<String,ArrayList<String>>>(); TreeMap<String, HashMap<String, ArrayList<String>>> finalMap = new TreeMap<String, HashMap<String,ArrayList<String>>>();
System.out.println(":: In getPlanVsActualTreeStructure fromDate["+fromDate+"] toDate["+toDate+"]");
/*----------Planned doctors visited-----Planned--------*/ /*----------Planned doctors visited-----Planned--------*/
if("".equalsIgnoreCase(fromDate) && "".equalsIgnoreCase(toDate)){ if("".equalsIgnoreCase(fromDate) && "".equalsIgnoreCase(toDate)){
fromDate = getDateString("firstDayOfWeek",formatter); fromDate = getDateString("firstDayOfWeek",formatter);
...@@ -125,8 +129,15 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -125,8 +129,15 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
else { else {
appendSQL = " AND sp.sales_pers in("+salePersons+")) "; appendSQL = " AND sp.sales_pers in("+salePersons+")) ";
//e12GenericUtility = new E12GenericUtility(); //e12GenericUtility = new E12GenericUtility();
fromDate = e12GenericUtility.getValidDateString(fromDate, "dd/MM/yyyy", "dd-MMM-yy"); //fromDate = e12GenericUtility.getValidDateString(fromDate, "dd/MM/yyyy", "dd-MMM-yy");
toDate = e12GenericUtility.getValidDateString(toDate, "dd/MM/yyyy", "dd-MMM-yy"); //toDate = e12GenericUtility.getValidDateString(toDate, "dd/MM/yyyy", "dd-MMM-yy");
//Updated By Saitej D on 4Jan18 [To Set Application Date] START
fromDate = e12GenericUtility.getValidDateString(fromDate, sourceDateFormat, "dd-MMM-yy");
toDate = e12GenericUtility.getValidDateString(toDate, sourceDateFormat, "dd-MMM-yy");
//Updated By Saitej D on 4Jan18 [To Set Application Date] END
System.out.println(":: In Date not Null fromDate["+fromDate+"] toDate["+toDate+"] sourceDateFormat:["+sourceDateFormat+"] targetDateFormat:["+targetDateFormat+"]");
} }
sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ,INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )AS DOCTORNAME ,L.DESCR AS LOCALITY ,SPL.DESCR AS SPECIALITY 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 L ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN STRG_SERIES SS ON SS.SC_CODE=SC.SC_CODE INNER JOIN SPECIALITY SPL ON SPL.SPL_CODE=SS.SPL_CODE " + sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ,INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )AS DOCTORNAME ,L.DESCR AS LOCALITY ,SPL.DESCR AS SPECIALITY 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 L ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN STRG_SERIES SS ON SS.SC_CODE=SC.SC_CODE INNER JOIN SPECIALITY SPL ON SPL.SPL_CODE=SS.SPL_CODE " +
...@@ -367,7 +378,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -367,7 +378,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
connDriver = null; connDriver = null;
formatter = new SimpleDateFormat("dd-MMM-yy"); formatter = new SimpleDateFormat("dd-MMM-yy");
HashMap<String, ArrayList<String>> planHashMap = new HashMap<String, ArrayList<String>>(); HashMap<String, ArrayList<String>> planHashMap = new HashMap<String, ArrayList<String>>();
String sourceDateFormat=e12GenericUtility.getApplDateFormat();
String targetDateFormat=e12GenericUtility.getDBDateFormat();
ArrayList<String> docList = new ArrayList<String>(); ArrayList<String> docList = new ArrayList<String>();
TreeMap<String, HashMap<String, ArrayList<String>>> finalMap = new TreeMap<String, HashMap<String,ArrayList<String>>>(); TreeMap<String, HashMap<String, ArrayList<String>>> finalMap = new TreeMap<String, HashMap<String,ArrayList<String>>>();
...@@ -381,8 +393,15 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -381,8 +393,15 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
} }
else { else {
appendSQL = " AND sp.sales_pers in("+salePersons+")) "; appendSQL = " AND sp.sales_pers in("+salePersons+")) ";
fromDate = e12GenericUtility.getValidDateString(fromDate, "dd/MM/yyyy", "dd-MMM-yy");
toDate = e12GenericUtility.getValidDateString(toDate, "dd/MM/yyyy", "dd-MMM-yy"); //Updated By Saitej D on 4Jan18 [To Set Application Date] START
//fromDate = e12GenericUtility.getValidDateString(fromDate, "dd/MM/yyyy", "dd-MMM-yy");
//toDate = e12GenericUtility.getValidDateString(toDate, "dd/MM/yyyy", "dd-MMM-yy");
fromDate = e12GenericUtility.getValidDateString(fromDate, sourceDateFormat, "dd-MMM-yy");
toDate = e12GenericUtility.getValidDateString(toDate, sourceDateFormat, "dd-MMM-yy");
//Updated By Saitej D on 4Jan18 [To Set Application Date] END
} }
sql = "( SELECT TO_CHAR(ST.TRAVEL_DATE,'DD-MON-YYYY') AS EVENTDATE , SP.SALES_PERS , SP.SP_NAME , ST.LOCALITY_CODE , " sql = "( SELECT TO_CHAR(ST.TRAVEL_DATE,'DD-MON-YYYY') AS EVENTDATE , SP.SALES_PERS , SP.SP_NAME , ST.LOCALITY_CODE , "
......
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