Changes made in OpportunityStageInfo.java and OpportunityStageSummary.java

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

webitm-dashboard/ibase/dashboard/crm/ejb/OpportunityStageInfo.java

@@ -44,7 +44,7 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 		    pstmt.setString(1, loginCode);
 		    rs = pstmt.executeQuery();
 		    while(rs.next()){
-		    	salesPersEmpCode = rs.getString("emp_code");
+		    	salesPersEmpCode = rs.getString("sales_pers");
 		    }
 			
 		    if (rs != null) {

webitm-dashboard/ibase/dashboard/crm/ejb/OpportunityStageSummary.java

@@ -52,7 +52,7 @@ OpportunityStageSummaryRemote {
 		    pstmt.setString(1, loginCode);
 		    rs = pstmt.executeQuery();
 		    while(rs.next()){
-		    	salesPersEmpCode = rs.getString("emp_code");
+		    	salesPersEmpCode = rs.getString("sales_pers");
 		    }
 			
 		    if (rs != null) {
@@ -202,22 +202,7 @@ OpportunityStageSummaryRemote {
 			ArrayList<Integer> oppCnt = new ArrayList<Integer>();
 
 			conn = connection.getConnectDB(dataSourceName);
-			sql = "select sales_pers from sales_pers where emp_code = ?";
-			pstmt = conn.prepareStatement(sql);
-		    pstmt.setString(1, loginCode);
-		    rs = pstmt.executeQuery();
-		    while(rs.next()){
-		    	salesPersEmpCode = rs.getString("emp_code");
-		    }
 			
-		    if (rs != null) {
-				rs.close();
-				rs = null;
-			}
-		    if (pstmt != null) {
-				pstmt.close();
-				pstmt = null;
-			}
 			sql = "SELECT opp.oppr_id,"
 					+ "opp.oppr_name,"
 					+ "opp.oppr_type,"
@@ -267,7 +252,7 @@ OpportunityStageSummaryRemote {
 					+ "order by oppr_date,ass_date";
 
 			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1, salesPersEmpCode);
+			pstmt.setString(1, loginCode);
 			rs = pstmt.executeQuery();
 			while (rs.next()) {
 
@@ -372,22 +357,7 @@ OpportunityStageSummaryRemote {
 			ArrayList<Double> oppValue = new ArrayList<Double>();
 
 			conn = connection.getConnectDB(dataSourceName);
-			sql = "select sales_pers from sales_pers where emp_code = ?";
-			pstmt = conn.prepareStatement(sql);
-		    pstmt.setString(1, loginCode);
-		    rs = pstmt.executeQuery();
-		    while(rs.next()){
-		    	salesPersEmpCode = rs.getString("emp_code");
-		    }
 			
-		    if (rs != null) {
-				rs.close();
-				rs = null;
-			}
-		    if (pstmt != null) {
-				pstmt.close();
-				pstmt = null;
-			}
 			sql = "SELECT opp.oppr_id,"
 					+ "opp.oppr_name,"
 					+ "opp.oppr_type,"
@@ -437,7 +407,7 @@ OpportunityStageSummaryRemote {
 					+ "order by oppr_date,ass_date";
 
 			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1, salesPersEmpCode);
+			pstmt.setString(1, loginCode);
 			rs = pstmt.executeQuery();
 			while (rs.next()) {
 
@@ -545,22 +515,7 @@ OpportunityStageSummaryRemote {
 			ArrayList<Double> orgCountPnct = new ArrayList<Double>();
 
 			conn = connection.getConnectDB(dataSourceName);
-			sql = "select sales_pers from sales_pers where emp_code = ?";
-			pstmt = conn.prepareStatement(sql);
-		    pstmt.setString(1, loginCode);
-		    rs = pstmt.executeQuery();
-		    while(rs.next()){
-		    	salesPersEmpCode = rs.getString("emp_code");
-		    }
 			
-		    if (rs != null) {
-				rs.close();
-				rs = null;
-			}
-		    if (pstmt != null) {
-				pstmt.close();
-				pstmt = null;
-			}
 			sql = "SELECT opp.oppr_id,"
 					+ "opp.oppr_name,"
 					+ "opp.oppr_type,"