Skip to content

B
business-java
Commit 3747fde9 authored by nsawalakhe's avatar nsawalakhe
Browse files
Options

Added Changes in complianceDB2 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102946 ce508802-f39f-4f6c-b175-0d175dae99d5
parent eafe044b
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 74 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2.java
View file @ 3747fde9
...@@ -5,6 +5,7 @@ import ibase.utility.CommonConstants; ...@@ -5,6 +5,7 @@ import ibase.utility.CommonConstants;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.io.File; import java.io.File;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
...@@ -319,6 +320,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -319,6 +320,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
/*sql = "Select '01/10/2015' as AVAILABLE_DY, 'FW' as ACTIVITY_CODE from Dual";*/ /*sql = "Select '01/10/2015' as AVAILABLE_DY, 'FW' as ACTIVITY_CODE from Dual";*/
sql = "SELECT F.REPCODE , F.REPNAME , F.REPDESG , F.REP_NONREP , " + sql = "SELECT F.REPCODE , F.REPNAME , F.REPDESG , F.REP_NONREP , " +
"DATE(F.AVAILABLE_DY) AS AVAILABLE_DY , " + "DATE(F.AVAILABLE_DY) AS AVAILABLE_DY , " +
"F.ACTIVITY_CODE,(select descr from fieldactivity " + "F.ACTIVITY_CODE,(select descr from fieldactivity " +
...@@ -346,6 +348,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -346,6 +348,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
"LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " + "LEFT JOIN STRG_CUSTOMER ON STRG_MEET.STRG_CODE = STRG_CUSTOMER.SC_CODE ,VW_SALES_HIER_JJ " +
"WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.REPNAME = '"+personName+"' ) F WHERE F.REP_NONREP <> '-' ORDER BY F.AVAILABLE_DY "; "WHERE SALES_PERS_AV.SALESPERS = VW_SALES_HIER_JJ.REPCODE AND VW_SALES_HIER_JJ.REPNAME = '"+personName+"' ) F WHERE F.REP_NONREP <> '-' ORDER BY F.AVAILABLE_DY ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
int count = 0; int count = 0;
...@@ -456,12 +459,12 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -456,12 +459,12 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
appendSqlStr = ""; appendSqlStr = "";
} }
System.out.println("appendSqlStr :"+appendSqlStr); System.out.println("appendSqlStr :"+appendSqlStr);
sql = "select a.emp_code, a.emp_name from (select emp_code, emp_fname ||' '|| emp_lname emp_name from employee where report_to = "+loginEmpCode+" ) a " + //sql = "select a.emp_code, a.emp_name from (select emp_code, emp_fname ||' '|| emp_lname emp_name from employee where report_to = "+loginEmpCode+" ) a " +
" " + appendSqlStr + " " ; //" " + appendSqlStr + " " ;
/*sql = "select E.emp_code, CONCAT(CONCAT(E.emp_Fname,' '),E.EMP_LNAME) AS EMP_NAME " + sql = "select E.emp_code, CONCAT(CONCAT(E.emp_Fname,' '),E.EMP_LNAME) AS EMP_NAME " +
"FROM EMPLOYEE E WHERE E.emp_code in " + "FROM EMPLOYEE E WHERE E.emp_code in " +
"( select emp_code from EMPLOYEE WHERE (fn_get_hierarcy_NIGEL(emp_code,"+loginEmpCode+"))>0 ) " + "( select emp_code from EMPLOYEE WHERE (fn_get_hierarcy_NIGEL(emp_code,"+loginEmpCode+"))>0 ) " +
" " + appendSqlStr + " " ;*/ " " + appendSqlStr + " " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -618,7 +621,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -618,7 +621,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
System.out.println("In getComplDayWiseSummary selected ==>>fromDate = ["+fromDate+"] toDate = ["+toDate+"] selectedSalePerson = ["+selectedSalePerson+"]" ); System.out.println("In getComplDayWiseSummary selected ==>>fromDate = ["+fromDate+"] toDate = ["+toDate+"] selectedSalePerson = ["+selectedSalePerson+"]" );
//Code for db2 Start //Code for db2 Start
/*sql = "SELECT M.SALES_PERS " + sql = "SELECT M.SALES_PERS " +
",S.SP_NAME " + ",S.SP_NAME " +
",DATE (M.EVENT_DATE) AS EVENT_DATE " + ",DATE (M.EVENT_DATE) AS EVENT_DATE " +
",(SELECT COUNT(ST.LOCALITY_CODE) FROM SPRS_TRAVEL ST where M.EVENT_DATE= ST.TRAVEL_DATE AND M.SALES_PERS = ST.SALES_PERS) LOCALITY " + ",(SELECT COUNT(ST.LOCALITY_CODE) FROM SPRS_TRAVEL ST where M.EVENT_DATE= ST.TRAVEL_DATE AND M.SALES_PERS = ST.SALES_PERS) LOCALITY " +
...@@ -628,11 +631,11 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -628,11 +631,11 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
" LEFT JOIN SALES_PERS S ON S.SALES_PERS = M.SALES_PERS " + " LEFT JOIN SALES_PERS S ON S.SALES_PERS = M.SALES_PERS " +
" LEFT JOIN STRG_CUSTOMER D ON D.SC_CODE = M.STRG_CODE " + " LEFT JOIN STRG_CUSTOMER D ON D.SC_CODE = M.STRG_CODE " +
" WHERE M.SALES_PERS = '"+selectedSalePerson+"' AND M.EVENT_DATE BETWEEN TIMESTAMP('"+fromDate+"') AND TIMESTAMP('"+toDate+"') " + " WHERE M.SALES_PERS = '"+selectedSalePerson+"' AND M.EVENT_DATE BETWEEN TIMESTAMP('"+fromDate+"') AND TIMESTAMP('"+toDate+"') " +
" GROUP BY S.SP_NAME ,M.EVENT_DATE ,M.SALES_PERS ORDER BY M.EVENT_DATE";*/ " GROUP BY S.SP_NAME ,M.EVENT_DATE ,M.SALES_PERS ORDER BY M.EVENT_DATE";
//Code for db2 End //Code for db2 End
//Code for base Start //Code for base Start
sql = "SELECT S.SALES_PERS, " + /*sql = "SELECT S.SALES_PERS, " +
"S.SP_NAME, " + "S.SP_NAME, " +
"to_char(M.EVENT_DATE,'dd/mm/yy') as EVENT_DATE, " + "to_char(M.EVENT_DATE,'dd/mm/yy') as EVENT_DATE, " +
"COUNT(M.LOCALITY_CODE) LOC_CODE, " + "COUNT(M.LOCALITY_CODE) LOC_CODE, " +
...@@ -645,7 +648,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -645,7 +648,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
"AND M.EVENT_DATE BETWEEN '"+fromDate+"' AND '"+toDate+"'" + "AND M.EVENT_DATE BETWEEN '"+fromDate+"' AND '"+toDate+"'" +
" AND D.CUST_TYPE != 'S' " + " AND D.CUST_TYPE != 'S' " +
"GROUP BY S.SP_NAME,M.EVENT_DATE,S.SALES_PERS " + "GROUP BY S.SP_NAME,M.EVENT_DATE,S.SALES_PERS " +
"ORDER BY M.EVENT_DATE"; "ORDER BY M.EVENT_DATE";*/
//Code for base Start //Code for base Start
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -735,22 +738,22 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -735,22 +738,22 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
/*sql = " SELECT S.TRAN_ID, " + sql = " SELECT S.TRAN_ID, " +
" VARCHAR(DATE(S.EVENT_DATE)) AS EVENT_DATE, " + " VARCHAR(DATE(S.EVENT_DATE)) AS EVENT_DATE, " +
"S.ACTIVITY_CODE,F.DESCR AS ACTIVITY_DESCR, S.SALES_PERS, S.REMARKS, " + "S.ACTIVITY_CODE,F.DESCR AS ACTIVITY_DESCR, S.SALES_PERS, S.REMARKS, " +
" E.EMP_FNAME , E.EMP_MNAME, E.EMP_LNAME," + " E.EMP_FNAME , E.EMP_MNAME, E.EMP_LNAME," +
" S.SPRS_CODE__WW,S.DCR_ID,S.OTH_PARTICIPANT,S.CONFIRMED FROM SPRS_ACT_TRAN S , " + " S.SPRS_CODE__WW,S.DCR_ID,S.OTH_PARTICIPANT,S.CONFIRMED FROM SPRS_ACT_TRAN S , " +
" EMPLOYEE E, FIELDACTIVITY F WHERE S.SALES_PERS = E.EMP_CODE AND S.ACTIVITY_CODE = F.ACTIVITY_CODE AND " + " EMPLOYEE E, FIELDACTIVITY F WHERE S.SALES_PERS = E.EMP_CODE AND S.ACTIVITY_CODE = F.ACTIVITY_CODE AND " +
" S.SALES_PERS = '"+salesPersCode+"' AND S.EVENT_DATE = TIMESTAMP('"+eventDate+"') "; " S.SALES_PERS = '"+salesPersCode+"' AND S.EVENT_DATE = TIMESTAMP('"+eventDate+"') ";
*/
//Code for Base Start //Code for Base Start
sql = " SELECT S.TRAN_ID, " + /*sql = " SELECT S.TRAN_ID, " +
"to_char(S.EVENT_DATE,'dd/mm/yy') as EVENT_DATE, " + "to_char(S.EVENT_DATE,'dd/mm/yy') as EVENT_DATE, " +
"S.ACTIVITY_CODE,F.DESCR AS ACTIVITY_DESCR, S.SALES_PERS, S.REMARKS, " + "S.ACTIVITY_CODE,F.DESCR AS ACTIVITY_DESCR, S.SALES_PERS, S.REMARKS, " +
" E.EMP_FNAME , E.EMP_MNAME, E.EMP_LNAME," + " E.EMP_FNAME , E.EMP_MNAME, E.EMP_LNAME," +
" S.SPRS_CODE__WW,S.DCR_ID,S.OTH_PARTICIPANT,S.CONFIRMED FROM SPRS_ACT_TRAN S , " + " S.SPRS_CODE__WW,S.DCR_ID,S.OTH_PARTICIPANT,S.CONFIRMED FROM SPRS_ACT_TRAN S , " +
" EMPLOYEE E, FIELDACTIVITY F WHERE S.SALES_PERS = E.EMP_CODE AND S.ACTIVITY_CODE = F.ACTIVITY_CODE AND " + " EMPLOYEE E, FIELDACTIVITY F WHERE S.SALES_PERS = E.EMP_CODE AND S.ACTIVITY_CODE = F.ACTIVITY_CODE AND " +
" S.SALES_PERS = '"+salesPersCode+"' AND S.EVENT_DATE = '"+eventDate+"' "; " S.SALES_PERS = '"+salesPersCode+"' AND S.EVENT_DATE = '"+eventDate+"' ";*/
//Code for Base End //Code for Base End
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -821,7 +824,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -821,7 +824,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
pstmt = null; pstmt = null;
//Code for db2 Start //Code for db2 Start
/*sql = "SELECT SM.TRAN_ID, SP.SH_NAME AS WORK_WITH, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, SM.STRG_CODE,SM.STRG_NAME" + sql = "SELECT SM.TRAN_ID, SP.SH_NAME AS WORK_WITH, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, SM.STRG_CODE,SM.STRG_NAME" +
", CUST1.FIRST_NAME AS CUST_FNAME, SM_ITEM.QUANTITY, SM_ITEM.BRIEFED_DESCR, SM_ITEM.ITEM_CODE" + ", CUST1.FIRST_NAME AS CUST_FNAME, SM_ITEM.QUANTITY, SM_ITEM.BRIEFED_DESCR, SM_ITEM.ITEM_CODE" +
", ITEM.DESCR AS ITEM_DESCR, CUST1.MIDDLE_NAME CUST_MNAME , CUST1.LAST_NAME AS CUST_LNAME " + ", ITEM.DESCR AS ITEM_DESCR, CUST1.MIDDLE_NAME CUST_MNAME , CUST1.LAST_NAME AS CUST_LNAME " +
", SM.STRG_TYPE, SM.STRG_NO_VISIT, SM.EVENT_TIME_START, SM.EVENT_TIME_END, SM.STRG_CLASS_CODE " + ", SM.STRG_TYPE, SM.STRG_NO_VISIT, SM.EVENT_TIME_START, SM.EVENT_TIME_END, SM.STRG_CLASS_CODE " +
...@@ -846,41 +849,31 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -846,41 +849,31 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
" LEFT JOIN STRG_MEET_TEAM SMT ON SM.DCR_ID = SMT.DCR_ID AND SM.STRG_CODE = SMT.STRG_CODE " + " LEFT JOIN STRG_MEET_TEAM SMT ON SM.DCR_ID = SMT.DCR_ID AND SM.STRG_CODE = SMT.STRG_CODE " +
" LEFT JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SPRS_CODE__WW " + " LEFT JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SPRS_CODE__WW " +
" WHERE SM.DCR_ID = '"+dcrId+"' AND CUST_CLASS.CUST_TYPE ='D' AND SM.STRG_TYPE = 'D'" + " WHERE SM.DCR_ID = '"+dcrId+"' AND CUST_CLASS.CUST_TYPE ='D' AND SM.STRG_TYPE = 'D'" +
" ORDER BY SM.STRG_CODE";*/ " ORDER BY SM.STRG_CODE";
//Code for db2 End //Code for db2 End
//Code for Base Start //Code for Base Start
//This sql remove some table only For testing purpuse only //This sql remove some table only For testing purpuse only
sql = "SELECT SM.TRAN_ID, SP.SH_NAME AS WORK_WITH, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, SM.STRG_CODE,SM.STRG_NAME" + /*sql = " SELECT SM.TRAN_ID, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, " +
", CUST1.FIRST_NAME AS CUST_FNAME, SM_ITEM.QUANTITY, SM_ITEM.BRIEFED_DESCR, SM_ITEM.ITEM_CODE" + //" SM_ITEM.QUANTITY, SM_ITEM.BRIEFED_DESCR, SM_ITEM.ITEM_CODE, ITEM.DESCR AS ITEM_DESCR," +
", ITEM.DESCR AS ITEM_DESCR, CUST1.MIDDLE_NAME CUST_MNAME , CUST1.LAST_NAME AS CUST_LNAME " + "SM.STRG_CODE,SM.STRG_NAME, CUST1.FIRST_NAME AS CUST_FNAME," +
", SM.STRG_TYPE, SM.STRG_NO_VISIT, SM.EVENT_TIME_START, SM.EVENT_TIME_END, SM.STRG_CLASS_CODE " + " CUST1.MIDDLE_NAME CUST_MNAME , CUST1.LAST_NAME AS CUST_LNAME , " +
//", CUST_CLASS.CLASS_CODE_DESCR " + "SM.STRG_TYPE, SM.STRG_NO_VISIT, SM.EVENT_TIME_START, " +
", SM.STRG_CODE " + " SM.EVENT_TIME_END, SM.STRG_CLASS_CODE , " +
",SM.SALES_PERS, E.EMP_FNAME AS SPRS_FNAME, E.EMP_MNAME AS SPRS_MNAME" + "SM.SALES_PERS, E.EMP_FNAME AS SPRS_FNAME, " +
", E.EMP_LNAME AS SPRS_LNAME, SM.SALES_TEAM, E1.EMP_FNAME AS SALES_TEAM_FNAME, E1.EMP_MNAME AS SALES_TEAM_MNAME" + "E.EMP_MNAME AS SPRS_MNAME," +
", E1.EMP_LNAME AS SALES_TEAM_LNAME , SM.OTH_PARTICIPANT, SM.REMARKS,SM.ORDER_BOOKED, SM.MEET_SUMM, SM.LOCALITY_CODE" + " E.EMP_LNAME AS SPRS_LNAME, SM.SALES_TEAM, E1.EMP_FNAME AS SALES_TEAM_FNAME, E1.EMP_MNAME AS SALES_TEAM_MNAME, E1.EMP_LNAME AS SALES_TEAM_LNAME , " +
", SM.TEMPLATE_FILE, SM.SPRS_CODE__WW, E2.EMP_FNAME AS SPRS_CODE__WW_FNAME, E2.EMP_MNAME AS SPRS_CODE__WW_MNAME" + " SM.OTH_PARTICIPANT, SM.REMARKS,SM.ORDER_BOOKED, SM.MEET_SUMM, SM.LOCALITY_CODE, SM.TEMPLATE_FILE, SM.SPRS_CODE__WW, " +
", E2.EMP_LNAME AS SPRS_CODE__WW_LNAME, SM.LAST_MEET_SUMM, SM.LAST_MEET_DATE, SM.LAST_PROD_BRF, SM.REF_TRAN_ID" + " E2.EMP_FNAME AS SPRS_CODE__WW_FNAME, E2.EMP_MNAME AS SPRS_CODE__WW_MNAME, E2.EMP_LNAME AS SPRS_CODE__WW_LNAME, SM.LAST_MEET_SUMM," +
", SM.CONF_DATE, SM.CONFIRMED, SM.EMP_CODE__APRV, SM.SHORT_ID, SM.SC_CODE__REF, SM.MEET_SUMM_MGR, SM.DCR_ID" + " SM.LAST_MEET_DATE, SM.LAST_PROD_BRF, SM.REF_TRAN_ID, SM.CONF_DATE, SM.CONFIRMED, SM.EMP_CODE__APRV, SM.SHORT_ID, SM.SC_CODE__REF," +
", SM.WORK_TEAM, SM.WORK_WITH_OTHER, SM.POB_VAL " + " SM.MEET_SUMM_MGR, SM.DCR_ID, SM.WORK_TEAM, SM.WORK_WITH_OTHER, SM.POB_VAL FROM STRG_MEET SM" +
" ,SM.LOCALITY_CODE " + " LEFT JOIN STRG_CUSTOMER CUST1 ON CUST1.SC_CODE = SM.STRG_CODE" +
" ,LOCALITY.DESCR AS LOC_DESCR" + " LEFT JOIN EMPLOYEE E ON E.EMP_CODE = SM.SALES_PERS" +
" FROM STRG_MEET SM " + " LEFT JOIN EMPLOYEE E1 ON E1.EMP_CODE = SM.SALES_TEAM" +
" LEFT JOIN STRG_CUSTOMER CUST1 ON CUST1.SC_CODE = SM.STRG_CODE " +
" LEFT JOIN EMPLOYEE E ON E.EMP_CODE = SM.SALES_PERS " +
" LEFT JOIN EMPLOYEE E1 ON E1.EMP_CODE = SM.SALES_TEAM " +
" LEFT JOIN EMPLOYEE E2 ON E2.EMP_CODE = SM.SPRS_CODE__WW " + " LEFT JOIN EMPLOYEE E2 ON E2.EMP_CODE = SM.SPRS_CODE__WW " +
//" LEFT JOIN STRG_CUST_CLASS CUST_CLASS ON CUST_CLASS.CLASS_CODE = SM.STRG_CLASS_CODE " + //" LEFT JOIN STRG_MEET_ITEMS SM_ITEM ON SM_ITEM.DCR_ID = SM.DCR_ID " +
" LEFT JOIN STRG_MEET_ITEMS SM_ITEM ON SM_ITEM.DCR_ID = SM.DCR_ID and SM_ITEM.strg_code = SM.strg_code " + //" LEFT JOIN ITEM ITEM ON ITEM.ITEM_CODE = SM_ITEM.ITEM_CODE " +
" LEFT JOIN ITEM ITEM ON ITEM.ITEM_CODE = SM_ITEM.ITEM_CODE " + " WHERE SM.DCR_ID = '"+dcrId+"' AND SM.STRG_TYPE = 'D'";*/
" LEFT JOIN LOCALITY ON LOCALITY.LOCALITY_CODE=SM.LOCALITY_CODE " +
" LEFT JOIN STRG_MEET_TEAM SMT ON SM.DCR_ID = SMT.DCR_ID AND SM.STRG_CODE = SMT.STRG_CODE " +
" LEFT JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SPRS_CODE__WW " +
" WHERE SM.DCR_ID = '"+dcrId+"' " +
//"AND CUST_CLASS.CUST_TYPE ='D' " +
"AND SM.STRG_TYPE = 'D'" +
" ORDER BY SM.STRG_CODE";
//Code for Base End //Code for Base End
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -900,7 +893,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -900,7 +893,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("sno_doc", doctorCount); rowData.put("sno_doc", doctorCount);
rowData.put("str_class_code_descr", checkNull(rs.getString("STRG_CODE"))); rowData.put("str_class_code_descr", checkNull(rs.getString("CLASS_CODE_DESCR")));
rowData.put("doctor_name", checkNull(doctorName)); rowData.put("doctor_name", checkNull(doctorName));
if(checkNull(rs.getString("ITEM_CODE")) == "") if(checkNull(rs.getString("ITEM_CODE")) == "")
{ {
...@@ -940,7 +933,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -940,7 +933,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//Code for db2 Start //Code for db2 Start
/*sql = "SELECT SM.TRAN_ID ,SM.PLAN_ID ,SM.EVENT_DATE ,SM.EVENT_TYPE ,SM.STRG_CODE ,SM.STRG_NAME " + sql = "SELECT SM.TRAN_ID ,SM.PLAN_ID ,SM.EVENT_DATE ,SM.EVENT_TYPE ,SM.STRG_CODE ,SM.STRG_NAME " +
",CUST1.FIRST_NAME AS CUST_FNAME ,SM_ITEM.QUANTITY ,SM_ITEM.BRIEFED_DESCR ,SM_ITEM.ITEM_CODE " + ",CUST1.FIRST_NAME AS CUST_FNAME ,SM_ITEM.QUANTITY ,SM_ITEM.BRIEFED_DESCR ,SM_ITEM.ITEM_CODE " +
",ITEM.DESCR AS ITEM_DESCR ,CUST1.MIDDLE_NAME CUST_MNAME ,CUST1.LAST_NAME AS CUST_LNAME ,SM.STRG_TYPE " + ",ITEM.DESCR AS ITEM_DESCR ,CUST1.MIDDLE_NAME CUST_MNAME ,CUST1.LAST_NAME AS CUST_LNAME ,SM.STRG_TYPE " +
",SM.STRG_NO_VISIT ,SM.EVENT_TIME_START ,SM.EVENT_TIME_END ,SM.STRG_CLASS_CODE ,CUST_CLASS.CLASS_CODE_DESCR " + ",SM.STRG_NO_VISIT ,SM.EVENT_TIME_START ,SM.EVENT_TIME_END ,SM.STRG_CLASS_CODE ,CUST_CLASS.CLASS_CODE_DESCR " +
...@@ -963,38 +956,30 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -963,38 +956,30 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
" LEFT JOIN LOCALITY ON LOCALITY.LOCALITY_CODE=SM.LOCALITY_CODE " + " LEFT JOIN LOCALITY ON LOCALITY.LOCALITY_CODE=SM.LOCALITY_CODE " +
" WHERE SM.DCR_ID = '"+dcrId+"' AND CUST_CLASS.CUST_TYPE = 'C' AND SM.STRG_TYPE = 'C'" + " WHERE SM.DCR_ID = '"+dcrId+"' AND CUST_CLASS.CUST_TYPE = 'C' AND SM.STRG_TYPE = 'C'" +
" ORDER BY SM.STRG_CODE"; " ORDER BY SM.STRG_CODE";
*/ //Code for db2 End //Code for db2 End
//Code for Base Start //Code for Base Start
//This sql remove some table only For testing purpuse only //This sql remove some table only For testing purpuse only
sql = "SELECT SM.TRAN_ID ,SM.PLAN_ID ,SM.EVENT_DATE ,SM.EVENT_TYPE ,SM.STRG_CODE ,SM.STRG_NAME " + /*sql = " SELECT SM.TRAN_ID, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, " +
",CUST1.FIRST_NAME AS CUST_FNAME ,SM_ITEM.QUANTITY ,SM_ITEM.BRIEFED_DESCR ,SM_ITEM.ITEM_CODE " + "SM.STRG_CODE,SM.STRG_NAME, CUST1.FIRST_NAME AS CUST_FNAME," +
",ITEM.DESCR AS ITEM_DESCR ,CUST1.MIDDLE_NAME CUST_MNAME ,CUST1.LAST_NAME AS CUST_LNAME ,SM.STRG_TYPE " + //" SM_ITEM.QUANTITY, SM_ITEM.BRIEFED_DESCR, SM_ITEM.ITEM_CODE, ITEM.DESCR AS ITEM_DESCR," +
",SM.STRG_NO_VISIT ,SM.EVENT_TIME_START ,SM.EVENT_TIME_END ,SM.STRG_CLASS_CODE " + " CUST1.MIDDLE_NAME CUST_MNAME , CUST1.LAST_NAME AS CUST_LNAME , " +
//",CUST_CLASS.CLASS_CODE_DESCR " + "SM.STRG_TYPE, SM.STRG_NO_VISIT, SM.EVENT_TIME_START, " +
", SM.STRG_CODE " + " SM.EVENT_TIME_END, SM.STRG_CLASS_CODE , " +
",SM.SALES_PERS ,E.EMP_FNAME AS SPRS_FNAME ,E.EMP_MNAME AS SPRS_MNAME ,E.EMP_LNAME AS SPRS_LNAME ,SM.SALES_TEAM " + "SM.SALES_PERS, E.EMP_FNAME AS SPRS_FNAME, E.EMP_MNAME AS SPRS_MNAME," +
",E1.EMP_FNAME AS SALES_TEAM_FNAME ,E1.EMP_MNAME AS SALES_TEAM_MNAME ,E1.EMP_LNAME AS SALES_TEAM_LNAME ,SM.OTH_PARTICIPANT " + " E.EMP_LNAME AS SPRS_LNAME, SM.SALES_TEAM, E1.EMP_FNAME AS SALES_TEAM_FNAME, E1.EMP_MNAME AS SALES_TEAM_MNAME, E1.EMP_LNAME AS SALES_TEAM_LNAME , " +
",SM.REMARKS ,SM.ORDER_BOOKED ,SM.MEET_SUMM ,SM.LOCALITY_CODE ,SM.TEMPLATE_FILE ,SM.SPRS_CODE__WW " + " SM.OTH_PARTICIPANT, SM.REMARKS,SM.ORDER_BOOKED, SM.MEET_SUMM, SM.LOCALITY_CODE, SM.TEMPLATE_FILE, SM.SPRS_CODE__WW, " +
",E2.EMP_FNAME AS SPRS_CODE__WW_FNAME ,E2.EMP_MNAME AS SPRS_CODE__WW_MNAME ,E2.EMP_LNAME AS SPRS_CODE__WW_LNAME " + " E2.EMP_FNAME AS SPRS_CODE__WW_FNAME, E2.EMP_MNAME AS SPRS_CODE__WW_MNAME, E2.EMP_LNAME AS SPRS_CODE__WW_LNAME, SM.LAST_MEET_SUMM," +
",SM.LAST_MEET_SUMM ,SM.LAST_MEET_DATE ,SM.LAST_PROD_BRF ,SM.REF_TRAN_ID ,SM.CONF_DATE ,SM.CONFIRMED ,SM.EMP_CODE__APRV " + " SM.LAST_MEET_DATE, SM.LAST_PROD_BRF, SM.REF_TRAN_ID, SM.CONF_DATE, SM.CONFIRMED, SM.EMP_CODE__APRV, SM.SHORT_ID, SM.SC_CODE__REF," +
",SM.SHORT_ID ,SM.SC_CODE__REF ,SM.MEET_SUMM_MGR ,SM.DCR_ID ,SM.WORK_TEAM ,SM.WORK_WITH_OTHER ,SM.POB_VAL " + " SM.MEET_SUMM_MGR, SM.DCR_ID, SM.WORK_TEAM, SM.WORK_WITH_OTHER, SM.POB_VAL FROM STRG_MEET SM" +
" ,SM.LOCALITY_CODE " + " LEFT JOIN STRG_CUSTOMER CUST1 ON CUST1.SC_CODE = SM.STRG_CODE" +
" ,LOCALITY.DESCR AS LOC_DESCR" + " LEFT JOIN EMPLOYEE E ON E.EMP_CODE = SM.SALES_PERS" +
" FROM STRG_MEET SM " + " LEFT JOIN EMPLOYEE E1 ON E1.EMP_CODE = SM.SALES_TEAM" +
" LEFT JOIN STRG_CUSTOMER CUST1 ON CUST1.SC_CODE = SM.STRG_CODE " + " LEFT JOIN EMPLOYEE E2 ON E2.EMP_CODE = SM.SPRS_CODE__WW " +
" LEFT JOIN EMPLOYEE E ON E.EMP_CODE = SM.SALES_PERS " + //" LEFT JOIN STRG_MEET_ITEMS SM_ITEM ON SM_ITEM.DCR_ID = SM.DCR_ID " +
" LEFT JOIN EMPLOYEE E1 ON E1.EMP_CODE = SM.SALES_TEAM " + //" LEFT JOIN ITEM ITEM ON ITEM.ITEM_CODE = SM_ITEM.ITEM_CODE " +
" LEFT JOIN EMPLOYEE E2 ON E2.EMP_CODE = SM.SPRS_CODE__WW " + " WHERE SM.DCR_ID = '"+dcrId+"' AND SM.STRG_TYPE = 'C'";*/
//" LEFT JOIN STRG_CUST_CLASS CUST_CLASS ON CUST_CLASS.CLASS_CODE = SM.STRG_CLASS_CODE " +
" LEFT JOIN STRG_MEET_ITEMS SM_ITEM ON SM_ITEM.DCR_ID = SM.DCR_ID and SM_ITEM.strg_code = SM.strg_code " +
" LEFT JOIN ITEM ITEM ON ITEM.ITEM_CODE = SM_ITEM.ITEM_CODE " +
" LEFT JOIN LOCALITY ON LOCALITY.LOCALITY_CODE=SM.LOCALITY_CODE " +
" WHERE SM.DCR_ID = '"+dcrId+"' " +
//"AND CUST_CLASS.CUST_TYPE = 'C' " +
"AND SM.STRG_TYPE = 'C'" +
" ORDER BY SM.STRG_CODE";
//Code for Base End //Code for Base End
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1011,7 +996,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -1011,7 +996,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("srno_chemist", chemistCount); rowData.put("srno_chemist", chemistCount);
rowData.put("strgclass_descr_chemist", checkNull(rs.getString("STRG_CODE"))); rowData.put("strgclass_descr_chemist", checkNull(rs.getString("CLASS_CODE_DESCR")));
rowData.put("chemist_name", checkNull(doctorName)); rowData.put("chemist_name", checkNull(doctorName));
if(checkNull(rs.getString("ITEM_CODE")) == "") if(checkNull(rs.getString("ITEM_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