Site_code_from and site_code_to description is not properly

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

webitm-adm/src/ibase/webitm/ejb/adm/PerkLapsePrcIc.java

@@ -300,8 +300,8 @@ public class PerkLapsePrcIc extends ValidatorEJB
 			{
 				currentFormNo = Integer.parseInt(objContext);
 			}
-			String sql="" ,siteCodeDescr ="",fullName="",empFname="";
-			String empLname="",adCodeDescr="",prcGroupFrDescr="",prcGroupToDescr="",dateFrStr="";
+			String sql="" ,siteCodeDescr ="",fullName="",empFname="",siteCodeFrom ="",siteCodeTo ="";
+			String empLname="",adCodeDescr="",prcGroupFrDescr="",prcGroupToDescr="",dateFrStr="",siteCodeFrDecr="",siteCodeToDescr="";
 			
 			logInEmpCode = getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
 			loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
@@ -327,7 +327,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 						pStmt = con.prepareStatement(sql);
 						pStmt.setString(1, loginSite);
 						rs = pStmt.executeQuery();
-						while(rs.next())
+						if(rs.next())
 						{
 							siteCodeDescr =rs.getString("descr");
 						}
@@ -352,13 +352,14 @@ public class PerkLapsePrcIc extends ValidatorEJB
 				}
 				else if("site_code__from".equalsIgnoreCase(currentColumn))
 				{
+					siteCodeFrom = E12GenericUtility.checkNull(genericUtility.getColumnValue("site_code__from", dom));
 					sql="select descr from site where site_code=?";
 					pStmt = con.prepareStatement(sql);
-					pStmt.setString(1, loginSite);
+					pStmt.setString(1, siteCodeFrom);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
-						siteCodeDescr =rs.getString("descr");
+						siteCodeFrDecr =rs.getString("descr");
 					}
 					if(rs!=null)
 					{
@@ -370,17 +371,18 @@ public class PerkLapsePrcIc extends ValidatorEJB
 						pStmt.close();
 						pStmt = null;
 					}
-					valueXmlString.append("<site_descr__from><![CDATA[").append(siteCodeDescr).append("]]></site_descr__from>");
+					valueXmlString.append("<site_descr__from><![CDATA[").append(siteCodeFrDecr).append("]]></site_descr__from>");
 				}
 				else if("site_code__to".equalsIgnoreCase(currentColumn))
 				{
+					siteCodeTo = E12GenericUtility.checkNull(genericUtility.getColumnValue("site_code__to", dom));
 					sql="select descr from site where site_code=?";
 					pStmt = con.prepareStatement(sql);
-					pStmt.setString(1, loginSite);
+					pStmt.setString(1, siteCodeTo);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
-						siteCodeDescr =rs.getString("descr");
+						siteCodeToDescr =rs.getString("descr");
 					}
 					if(rs!=null)
 					{
@@ -392,7 +394,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 						pStmt.close();
 						pStmt = null;
 					}
-					valueXmlString.append("<site_descr__to><![CDATA[").append(siteCodeDescr).append("]]></site_descr__to>");
+					valueXmlString.append("<site_descr__to><![CDATA[").append(siteCodeToDescr).append("]]></site_descr__to>");
 				}
 				else if("emp_code__from".equalsIgnoreCase(currentColumn))
 				{
@@ -401,7 +403,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 					pStmt = con.prepareStatement(sql);
 					pStmt.setString(1, empCode);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
 						empFname =rs.getString("emp_fname");
 						empLname =rs.getString("emp_lname");
@@ -428,7 +430,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 					pStmt = con.prepareStatement(sql);
 					pStmt.setString(1, empCodeTo);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
 						empFname =rs.getString("emp_fname");
 						empLname =rs.getString("emp_lname");
@@ -453,7 +455,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 					pStmt =con.prepareStatement(sql);
 					pStmt.setString(1, adCode);
 					rs =pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
 						adCodeDescr = rs.getString("descr"); 
 					}
@@ -477,7 +479,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 					pStmt.setString(1, "PROC_GROUP");
 					pStmt.setString(2, procGroupFr);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
 						prcGroupFrDescr=rs.getString("descr");
 					}
@@ -501,7 +503,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 					pStmt.setString(1, "PROC_GROUP");
 					pStmt.setString(2, procGroupTo);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
 						prcGroupToDescr=rs.getString("descr");
 					}
@@ -524,7 +526,7 @@ public class PerkLapsePrcIc extends ValidatorEJB
 					pStmt = con.prepareStatement(sql);
 					pStmt.setString(1, prdCode);
 					rs = pStmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{
 						Timestamp dateFr= rs.getTimestamp("fr_date");
 						dateFrStr = sdf.format(dateFr);