Commit e20d6ea7 authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 05/03/20

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217551 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ba52b218
...@@ -76,7 +76,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -76,7 +76,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
String errString = "",errCode= ""; String errString = "",errCode= "";
String userId = ""; String userId = "";
String mval1= "",mval= ""; String mval1= "",mval= "";
String sql = "",ls_accfilt="",cadreCode=""; String sql = "",lsAccfilt="",cadreCode="";
String effDateStr = ""; String effDateStr = "";
String expDateStr = ""; String expDateStr = "";
int currentFormNo = 0; int currentFormNo = 0;
...@@ -103,7 +103,8 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -103,7 +103,8 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
itmDbAcess = new ITMDBAccessEJB(); itmDbAcess = new ITMDBAccessEJB();
//SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); //Modified by Sana S on 08/11/19 //SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); //Modified by Sana S on 08/11/19
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy"); // SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy");
SimpleDateFormat sdf = new SimpleDateFormat( genericUtility.getApplDateFormat() );//Modifed by Sana S
conn = getConnection(); conn = getConnection();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("Line no----"); System.out.println("Line no----");
...@@ -308,7 +309,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -308,7 +309,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
{ {
//Modified by Sana S on 14/01/2020 [start] //Modified by Sana S on 14/01/2020 [start]
//ls_accfilt = rs.getString("ls_accfilt"); //ls_accfilt = rs.getString("ls_accfilt");
ls_accfilt = checkNull(rs.getString("ls_accfilt")); lsAccfilt = checkNull(rs.getString("ls_accfilt"));
//Modified by Sana S on 14/01/2020 [end] //Modified by Sana S on 14/01/2020 [end]
} }
if (rs != null) if (rs != null)
...@@ -321,14 +322,14 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -321,14 +322,14 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.print("ls_accfilt:"+ls_accfilt); System.out.print("ls_accfilt:"+lsAccfilt);
//Modified by Sana S on 14/01/2020 [start] //Modified by Sana S on 14/01/2020 [start]
if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0) if(!lsAccfilt.equals("") && lsAccfilt.trim().length() > 0)
//if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020 //if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020
//Modified by Sana S on 14/01/2020 [end] //Modified by Sana S on 14/01/2020 [end]
{ {
System.out.print("U R IN"); System.out.print("U R IN");
sql="select count(1) from allwdedn where ad_code = ? and " + ls_accfilt; sql="select count(1) from allwdedn where ad_code = ? and " + lsAccfilt;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval); pstmt.setString(1, mval);
...@@ -968,7 +969,6 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -968,7 +969,6 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
} }
if (rs != null) if (rs != null)
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }
......
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