changes done as per requirement in complianceDB2

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

webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2.java

@@ -12,7 +12,6 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 
 import javax.ejb.Stateless;
@@ -90,7 +89,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
 							"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
 							"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
 							"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
-							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
+							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ WHERE (NSMCODE = '"+loginId+"'  OR SMCODE = '"+loginId+"'  OR RSECODE = '"+loginId+"'  OR REPCODE = '"+loginId+"' )) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
 							"FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
 							"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
 							"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a  EXCEPT  " +
@@ -116,7 +115,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
 							"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
 							"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
 							"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
-							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time " +
+							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ WHERE (NSMCODE = '"+loginId+"'  OR SMCODE = '"+loginId+"'  OR RSECODE = '"+loginId+"'  OR REPCODE = '"+loginId+"' )) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a FROM sfa_time " +
 							"WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
 							"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
 							"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a  EXCEPT  SELECT EMPLOYEE.EMP_CODE AS SALESPERS ," +
@@ -140,7 +139,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
 							"THEN '-' ELSE 'NR' END ) AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, '')," +
 							" COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
 							"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
-							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ ) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
+							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ WHERE (NSMCODE = '"+loginId+"'  OR SMCODE = '"+loginId+"'  OR RSECODE = '"+loginId+"'  OR REPCODE = '"+loginId+"' )) VW_SALES_HIER_JJ ,( SELECT dt AS available_dy ,'a' AS a " +
 							"FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
 							"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
 					        "WHERE VW_SALES_HIER_JJ.a = AV_DATES.a  EXCEPT  " +
@@ -333,7 +332,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
 							"AS REP_NONREP ,CONCAT(CONCAT(COALESCE(STRG_CUSTOMER.FIRST_NAME, ''), " +
 							"COALESCE(STRG_CUSTOMER.MIDDLE_NAME, '')), COALESCE(STRG_CUSTOMER.LAST_NAME, '')) AS CUSTOMER_NAME " +
 							"FROM ( SELECT VW_SALES_HIER_JJ.REPCODE AS SALESPERS ,AV_DATES.available_dy AS AVAILABLE_DY " +
-							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ WHERE (NSMCODE = '"+personName+"'  OR SMCODE = '"+personName+"'  OR RSECODE = '"+personName+"'  OR REPCODE = '"+personName+"' )) VW_SALES_HIER_JJ ," +
+							"FROM ( SELECT REPCODE ,'a' AS a FROM VW_SALES_HIER_JJ WHERE VW_SALES_HIER_JJ.REPNAME = '"+personName+"') VW_SALES_HIER_JJ ," +
 							"( SELECT dt AS available_dy ,'a' AS a FROM sfa_time WHERE dt > TIMESTAMP(last_day((to_date(('"+period+"'),('YYYYMM'))) - 1 month) ,'00:00:00') " +
 							"AND DT <= TIMESTAMP(last_day(to_date(('"+period+"'),('YYYYMM'))) ,'00:00:00') ) AV_DATES " +
 							"WHERE VW_SALES_HIER_JJ.a = AV_DATES.a  EXCEPT  SELECT EMPLOYEE.EMP_CODE AS SALESPERS , " +
@@ -883,7 +882,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
 				count = 0;
 				String briefDescr = "";
 				String remarksDescr = "";
-				String strgCode = "";
+				//String strgCode = "";
 				while(rs.next())
 				{
 					System.out.println("In doctor doctorCount = "+doctorCount);
@@ -1066,8 +1065,8 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
 		ResultSet rs = null;
 		try
 		{
-			SimpleDateFormat gridDateFormat = new SimpleDateFormat(genericUtility.getDBDateTimeFormat());
-            SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(genericUtility.getApplDateFormat());
+			//SimpleDateFormat gridDateFormat = new SimpleDateFormat(genericUtility.getDBDateTimeFormat());
+            //SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(genericUtility.getApplDateFormat());
            
             //Code for Base Start
 			/*SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy");