Skip to content

B
business-java
Commit 942f62fb authored by pbhosale's avatar pbhosale
Browse files
Options

[Updated on 06-12-2019] 

AdmCommon.java
ArrearsDeletePrc.java
AttendanceDailyIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213202 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 36456acf
Show whitespace changes
Inline Side-by-side
Showing with 1114 additions and 94 deletions
webitm-adm/src/ibase/webitm/ejb/adm/AdmCommon.java
View file @ 942f62fb
...@@ -36,7 +36,6 @@ import org.w3c.dom.Document; ...@@ -36,7 +36,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.BaseLogger;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.bean.adm.LogWriterDatabase; import ibase.webitm.bean.adm.LogWriterDatabase;
...@@ -1569,39 +1568,56 @@ public class AdmCommon ...@@ -1569,39 +1568,56 @@ public class AdmCommon
} }
//Added by Poonam B[26/11/2019][START][method to check user level] //Added by Poonam B[26/11/2019][START][method to check user level]
public String chkHRMSiteAccess(String empCode , Date asOfDate , String empSite , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn) // modified by Poonam B[02/12/2019][To remove emp_site variable][START]
{ //public String chkHRMSiteAccess(String empCode , Date asOfDate , String empSite , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn)
public String chkHRMSiteAccess(String empCode , Date asOfDate , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn) throws ITMException
String status = "",retString="",errString=""; // modified by Poonam B[02/12/2019][To remove emp_site variable][END]
String relieveDateStr = ""; {
String status = "",errString="";
//modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][START]
//String relieveDateStr = "";
Timestamp relieveDateTS = null;
//modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][START]
String asOfDateStr = ""; String asOfDateStr = "";
String sql = "" ; String sql = "" ;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
java.util.Date relieveDate = null; java.util.Date relieveDate = null;
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
//Added by Poonam B[02/12/2019][To convert TimeStamp To Date][START]
UtilMethods utilMethods = new UtilMethods();
//Added by Poonam B[02/12/2019][To convert TimeStamp To Date][END]
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
String siteAccCol = ""; String siteAccCol = "";
String lsRowSecurity = "0"; String lsRowSecurity = "0";
String usrLevStr = ""; //String usrLevStr = "";
System.out.println("worksite is" + empSite); //System.out.println("worksite is" + empSite);
System.out.println("login site is" + loginSite); System.out.println("login site is" + loginSite);
System.out.println("userId is:::" + userId); System.out.println("userId is:::" + userId);
System.out.println("userLevel is:::" + userLevel); System.out.println("userLevel is:::" + userLevel);
System.out.println("loginEmpCode is:::" + loginEmpCode); System.out.println("loginEmpCode is:::" + loginEmpCode);
System.out.println("winName is:::" + winName); System.out.println("winName before if is:::" + winName);
// modified by Poonam B[02/12/2019][To append "w_" to given winName][END]
if(winName != null && !winName.startsWith("w_"))
{
winName = "w_"+winName;
}
System.out.println("winName after if is:::" + winName);
// modified by Poonam B[02/12/2019][To append "w_" to given winName][END]
try try
{ {
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
SimpleDateFormat dbsdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); //SimpleDateFormat dbsdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
System.out.println("******** Inside Admcommon chkHRMSiteAccess method *********"); System.out.println("******** Inside Admcommon chkHRMSiteAccess method *********");
System.out.println("userLevel from caller --->" +userLevel); System.out.println("userLevel from caller --->" +userLevel);
if(asOfDate != null) if(asOfDate != null)
{ {
asOfDateStr =sdf.format(asOfDate) ; asOfDateStr =sdf.format(asOfDate) ;
} }
if(userLevel == 0) // modified by Poonam B[02/12/2019][To check when userLevel is -1][START]
//if(userLevel == 0)
if(userLevel <= 0)
{ {
sql = "select usr_lev from users where code = ? "; sql = "select usr_lev from users where code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1610,8 +1626,9 @@ public class AdmCommon ...@@ -1610,8 +1626,9 @@ public class AdmCommon
if (rs.next()) if (rs.next())
{ {
usrLevStr = rs.getString("usr_lev"); //usrLevStr = rs.getString("usr_lev");
System.out.println("usrLevStr--->" +usrLevStr); userLevel = rs.getInt("usr_lev");
System.out.println("userLevel--->" +userLevel);
} }
if (rs != null) if (rs != null)
{ {
...@@ -1623,10 +1640,11 @@ public class AdmCommon ...@@ -1623,10 +1640,11 @@ public class AdmCommon
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(usrLevStr != null) /*if(usrLevStr != null)
{ {
userLevel = Integer.parseInt(usrLevStr); userLevel = Integer.parseInt(usrLevStr);
} }*/
// modified by Poonam B[02/12/2019][To check when userLevel is -1][END]
} }
System.out.println("userLevel after change --->" +userLevel); System.out.println("userLevel after change --->" +userLevel);
if(userLevel > 1) if(userLevel > 1)
...@@ -1657,8 +1675,11 @@ public class AdmCommon ...@@ -1657,8 +1675,11 @@ public class AdmCommon
} }
else else
{ {
lsRowSecurity = admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn); // modified by Poonam B[02/12/2019][To check when lsRowSecurity is NULLFOUND][START]
if(lsRowSecurity == null) //lsRowSecurity = admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn);
lsRowSecurity = checkNull(admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn));
if(lsRowSecurity == null || "NULLFOUND".equalsIgnoreCase(lsRowSecurity))
// modified by Poonam B[02/12/2019][To check when lsRowSecurity is NULLFOUND][END]
{ {
lsRowSecurity = "1"; lsRowSecurity = "1";
} }
...@@ -1672,24 +1693,35 @@ public class AdmCommon ...@@ -1672,24 +1693,35 @@ public class AdmCommon
} }
} }
} }
//sql = "SELECT RELIEVE_DATE , STATUS FROM EMPLOYEE WHERE EMP_CODE = ? "; //sql = "SELECT RELIEVE_DATE , STATUS FROM EMPLOYEE WHERE EMP_CODE = ? ";
/*sql = "select RELIEVE_DATE , STATUS from employee where emp_code = ? " +
" and emp_site = (case when ? = '2' then ? " +
" when ? = '0' then ? else (select site_code from user_site where user_id = ? and site_code = employee.emp_site) end)";*/
// modified by Poonam B[02/12/2019][To change emp_site in sql query][START]
sql = "select RELIEVE_DATE , STATUS from employee where emp_code = ? " + sql = "select RELIEVE_DATE , STATUS from employee where emp_code = ? " +
" and emp_site = (case when ? = '2' then ? " + " and emp_site = (case when ? = '2' then ? " +
" when ? = '0' then ? else (select site_code from user_site where user_id = ? and site_code = employee.emp_site) end)"; " when ? = '0' then emp_site else (select site_code from user_site where user_id = ? and site_code = employee.emp_site) end)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setString(2, lsRowSecurity); pstmt.setString(2, lsRowSecurity);
pstmt.setString(3, loginSite); pstmt.setString(3, loginSite);
pstmt.setString(4, lsRowSecurity); pstmt.setString(4, lsRowSecurity);
//pstmt.setString(5, loginEmpCode); //pstmt.setString(5, loginEmpCode);
pstmt.setString(5, empSite); //pstmt.setString(5, empSite);
pstmt.setString(6, userId); pstmt.setString(5, userId);
// modified by Poonam B[02/12/2019][To change emp_site in sql query][END]
rs= pstmt.executeQuery(); rs= pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
relieveDateStr = rs.getString("RELIEVE_DATE"); //modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][START]
status = rs.getString("STATUS"); //relieveDateStr = rs.getString("RELIEVE_DATE");
relieveDateTS = rs.getTimestamp("RELIEVE_DATE");
//modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][END]
//modified by Poonam B[03/12/2019][To add CheckNull][START]
//status = rs.getString("STATUS");
status = checkNull(rs.getString("STATUS"));
//modified by Poonam B[03/12/2019][To add CheckNull][END]
} }
else else
{ {
...@@ -1711,13 +1743,20 @@ public class AdmCommon ...@@ -1711,13 +1743,20 @@ public class AdmCommon
{ {
return errString; return errString;
} }
System.out.println("Relieve Date in chkHRMSiteAccess is " + relieveDateStr); System.out.println("Relieve Date in chkHRMSiteAccess is " + relieveDateTS);
System.out.println("Status in chkHRMSiteAccess is " + status ); System.out.println("Status in chkHRMSiteAccess is " + status );
if(relieveDateStr != null && relieveDateStr.trim().length() >0) /*if(relieveDateStr != null && relieveDateStr.trim().length() >0)
{ {
relieveDate = dbsdf.parse(relieveDateStr); relieveDate = dbsdf.parse(relieveDateStr);
}*/
//modified by Poonam B[02/12/2019][to convert relieveDateTS (Timestamp) to Date format][START]
if(relieveDateTS != null )
{
relieveDate = utilMethods.date(relieveDateTS);
} }
//modified by Poonam B[02/12/2019][to convert relieveDateTS (Timestamp) to Date format][END]
System.out.println("Relieve Date in chkHRMSiteAccess is " + relieveDate); System.out.println("Relieve Date in chkHRMSiteAccess is " + relieveDate);
...@@ -1732,9 +1771,10 @@ public class AdmCommon ...@@ -1732,9 +1771,10 @@ public class AdmCommon
System.out.println("asOfDate in chkHRMSiteAccess is " + asOfDate); System.out.println("asOfDate in chkHRMSiteAccess is " + asOfDate);
System.out.println("asOfDateStr in chkHRMSiteAccess is " + asOfDateStr); System.out.println("asOfDateStr in chkHRMSiteAccess is " + asOfDateStr);
if(relieveDateStr != null && (asOfDate.after(relieveDate) || asOfDate.equals(relieveDate)) && status.trim().equalsIgnoreCase("S")) //if(relieveDateStr != null && (asOfDate.after(relieveDate) || asOfDate.equals(relieveDate)) && status.trim().equalsIgnoreCase("S"))
if(relieveDateTS != null && (asOfDate.after(relieveDate) || asOfDate.equals(relieveDate)) && status.trim().equalsIgnoreCase("S"))
{ {
System.out.println("INSIDE IF LOOP OF chkHRMSiteAccess (relieveDateStr) " + relieveDateStr); System.out.println("INSIDE IF LOOP OF chkHRMSiteAccess (relieveDateTS) " + relieveDateTS);
errString = "VMEMP2"; errString = "VMEMP2";
return errString; return errString;
...@@ -1752,12 +1792,949 @@ public class AdmCommon ...@@ -1752,12 +1792,949 @@ public class AdmCommon
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); // Added By Poonam B[03/12/2019]
}
finally
{
try {
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null ;
}
}
catch (SQLException e) {
e.printStackTrace();
}
} }
return errString; return errString;
} }
//Added by Poonam B[26/11/2019][END][method to check user level] //Added by Poonam B[26/11/2019][END][method to check user level]
//Added by Poonam B[02/12/2019][START][method to get employee information]
//public LinkedHashMap fetchEmpMstInfo(String empCode , Date asOfDate , String empSite , String loginSite , Connection conn)
public HashMap fetchEmpMstInfo(String empCode , Date asOfDate , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn) throws ITMException
{
E12GenericUtility genericUtility = new E12GenericUtility();
HashMap fetchEmpMap = new HashMap<>();
//UtilMethods utilMethods = new UtilMethods();
AdmCommon admCommon = new AdmCommon();
//java.util.Date relieveDate = null;
//Timestamp relieveDateTS = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
//String errString = "";
String sql = "" ;
//String status = "";
//String asOfDateStr = "";
String siteAccCol = "";
String lsRowSecurity = "0";
String emp_Code = "";
String contactCode = "";
String empFName = "";
String empMName = "";
String empLName = "";
String namePrefix = "";
String empType = "";
String designation = "";
String deptCode = "";
String grade = "";
String cadre = "";
String reportTo = "";
String curAdd1 = "";
String curAdd2 = "";
String curAdd3 = "";
String curCity = "";
String curState = "";
String curPin = "";
String curTel1 = "";
String curTel2 = "";
String curTel3 = "";
String perAdd1 = "";
String perAdd2 = "";
String perAdd3 = "";
String perCity = "";
String perState = "";
String perPin = "";
String perTel = "";
String sex = "";
String nationality = "";
String citizen = "";
String stateCodeDomicile = "";
String mStatus = "";
Timestamp mStatusDate= null;
Timestamp birthDate = null;
String bloodGrp = "";
String contactPers = "";
String religion = "";
String joinedAs = "";
Timestamp dateJoin = null;
String modeApp = "";
String workShift = "";
String shiftRot = "";
String holTblNo = "";
String payType = "";
String payMode = "";
String emp_Site = "";
String paySite = "";
String workSite = "";
String bankCode = "";
String bankAcct = "";
String stanCode = "";
String ddPayableBank = "";
int totExp = 0;
String pfNo = "";
String fpfNo = "";
String esicNo = "";
String itNo = "";
int basic = 0;
int gross = 0;
String hobby1 = "";
String hobby2 = "";
String hobby3 = "";
String hobby4 = "";
String otherInfo = "";
String projCode = "";
String deputeNo = "";
String rating = "";
int trainingPrd = 0;
Timestamp probationDate = null;
int probationPrd = 0;
String probation = "";
Timestamp dateConf = null;
String confirmed = "";
int noticePrd = 0;
Timestamp residate = null;
Timestamp relieve_Date = null;
String empCodeLink = "";
String acctCodeSal = "";
String cctrCodeSal = "";
String alterCode = "";
String withHeld = "";
String apprNoLast = "";
String statusEmp = "";
Timestamp chgDate = null;
String chgUser = "";
String chgTerm = "";
String shortName = "";
String stanCodeHq = "";
String procGroup = "";
String contactAdd1 = "";
String contactAdd2 = "";
String contactAdd3 = "";
String contactCity = "";
String contactState = "";
String contactPin = "";
String contactTel = "";
int noticePeriod = 0;
String designCode = "";
String siteCodePayment = "";
String siteCodeIBCA = "";
String mobileNo = "";
String smsDomain = "";
String emailIDoff = "";
String emailIDPer = "";
String reportToAdmin = "";
String funcGroup = "";
String esiDispensary = "";
String autoAdv = "";
Timestamp incrDate = null;
int normalRate = 0;
int otRate = 0;
String maidenName = "";
String birthPlace = "";
String resiPermitNo = "";
Timestamp resiPermitUpto = null;
String socialSecNo = "";
String patternCode = "";
Timestamp gratuityDate = null;
String periodCode = "";
String eligibleOt = "";
String standbyMode = "";
String workTblNo = "";
String suppCodeCon = "";
int shiftIndex = 0;
String occupCode = "";
String empClass = "";
String imeNo = "";
String pensionScheme = "";
String posCode = "";
String workCtr = "";
int bondPrd = 0;
int BondAmt = 0;
String empCodeHod = "";
String passportNo = "";
Timestamp dateOfIssue = null;
String placeOfIssue = "";
Timestamp validUpto = null;
String addr1Pass = "";
String addr2Pass = "";
String addr3Pass = "";
String cityPass = "";
String stateCodePass = "";
String pinPass = "";
String uanNo = "";
String insiderTradingOpt = "";
String user_Id = "";
String workLocCode = "";
String parentDept = "";
String extNo = "";
String adharCardNo = "";
String electionNo = "";
String drivLicNo = "";
Timestamp drivLicUpto = null;
String physicalHandicap = "";
String handicapCategory = "";
String pfUan = "";
String grpMediclaim = "";
String pensionEligible = "";
String IFSC = "";
String buCode = "";
int bondAmtReco = 0;
String contactId = "";
String empCodeAprv = "";
Timestamp confDate = null;
String uuid = "";
String empCodeFunchead = "";
String motherTongue = "";
String castCategory = "";
String countCodeBirth = "";
String jobTitle = "";
String empIdexternal = "";
String empFnameLong = "";
String empMnameLong = "";
String empLnameLong = "";
String zoneCode = "";
String teamCode = "";
int designationID = 0;
int regionID = 0;
String hqid = "";
String shName = "";
String currGeoPos = "";
String perGeoPos = "";
int revisionNo = 0;
int retirementAge = 0;
Timestamp retirementDate = null;
System.out.println("login site is" + loginSite);
System.out.println("userId is:::" + userId);
System.out.println("userLevel is:::" + userLevel);
System.out.println("loginEmpCode is:::" + loginEmpCode);
System.out.println("winName before if is:::" + winName);
if(winName != null && !winName.startsWith("w_"))
{
winName = "w_"+winName;
}
System.out.println("winName after if is:::" + winName);
try
{
System.out.println("************ Inside fetchEmpMstInfo Method ******************");
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
System.out.println("userLevel from caller --->" +userLevel);
/*if(asOfDate != null)
{
asOfDateStr =sdf.format(asOfDate) ;
}*/
if(userLevel <= 0)
{
sql = "select usr_lev from users where code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, userId);
rs = pstmt.executeQuery();
if (rs.next())
{
userLevel = rs.getInt("usr_lev");
System.out.println("userLevel--->" +userLevel);
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
System.out.println("userLevel after change --->" +userLevel);
if(userLevel > 1)
{
sql = "select site_acc_col from transetup where tran_window = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, winName);
rs = pstmt.executeQuery();
if (rs.next())
{
siteAccCol = rs.getString("site_acc_col");
System.out.println("siteAccCol ::: "+siteAccCol);
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(siteAccCol != null && siteAccCol.trim().length() > 0)
{
lsRowSecurity = "2";
}
else
{
lsRowSecurity = checkNull(admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn));
if(lsRowSecurity == null || "NULLFOUND".equalsIgnoreCase(lsRowSecurity))
{
lsRowSecurity = "1";
}
else
{
lsRowSecurity = lsRowSecurity.trim();
if(!"0".equalsIgnoreCase(lsRowSecurity) && !"2".equalsIgnoreCase(lsRowSecurity))
{
lsRowSecurity = "1";
}
}
}
}
sql = "select * from employee where emp_code = ? " +
" and emp_site = (case when ? = '2' then ? " +
" when ? = '0' then emp_site else (select site_code from user_site where user_id = ? and site_code = employee.emp_site) end)";
//sql = "SELECT * FROM EMPLOYEE WHERE EMP_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, lsRowSecurity);
pstmt.setString(3, loginSite);
pstmt.setString(4, lsRowSecurity);
pstmt.setString(5, userId);
rs= pstmt.executeQuery();
if(rs.next())
{
emp_Code = rs.getString("EMP_CODE");
contactCode = rs.getString("CONTACT_CODE");
empFName = rs.getString("EMP_FNAME");
empMName = rs.getString("EMP_MNAME");
empLName = rs.getString("EMP_LNAME");
namePrefix = rs.getString("NAME_PREFIX");
empType = rs.getString("EMP_TYPE");
designation = rs.getString("DESIGNATION");
deptCode = rs.getString("DEPT_CODE");
grade = rs.getString("GRADE");
cadre = rs.getString("CADRE");
reportTo = rs.getString("REPORT_TO");
curAdd1 = rs.getString("CUR_ADD1");
curAdd2 = rs.getString("CUR_ADD2");
curAdd3 = rs.getString("CUR_ADD3");
curCity = rs.getString("CUR_CITY");
curState = rs.getString("CUR_STATE");
curPin = rs.getString("CUR_PIN");
curTel1 = rs.getString("CUR_TEL1");
curTel2 = rs.getString("CUR_TEL2");
curTel3 = rs.getString("CUR_TEL3");
perAdd1 = rs.getString("PER_ADD1");
perAdd2 = rs.getString("PER_ADD2");
perAdd3 = rs.getString("PER_ADD3");
perCity = rs.getString("PER_CITY");
perState = rs.getString("PER_STATE");
perPin = rs.getString("PER_PIN");
perTel = rs.getString("PER_TEL");
sex = rs.getString("SEX");
nationality = rs.getString("NATIONALITY");
citizen = rs.getString("CITIZEN");
stateCodeDomicile = rs.getString("STATE_CODE__DOMICILE");
mStatus = rs.getString("M_STATUS");
mStatusDate= rs.getTimestamp("M_STATUS_DATE");
birthDate = rs.getTimestamp("BIRTH_DATE");
bloodGrp = rs.getString("BLOOD_GRP");
contactPers = rs.getString("CONTACT_PERS");
religion = rs.getString("RELIGION");
joinedAs = rs.getString("JOINED_AS");
dateJoin = rs.getTimestamp("DATE_JOIN");
modeApp = rs.getString("MODE_APP");
workShift = rs.getString("WORK_SHIFT");
shiftRot = rs.getString("SHIFT_ROT");
holTblNo = rs.getString("HOL_TBLNO");
payType = rs.getString("PAY_TYPE");
payMode = rs.getString("PAY_MODE");
emp_Site = rs.getString("EMP_SITE");
paySite = rs.getString("PAY_SITE");
workSite = rs.getString("WORK_SITE");
bankCode = rs.getString("BANK_CODE");
bankAcct = rs.getString("BANK_ACCT");
stanCode = rs.getString("STAN_CODE");
ddPayableBank = rs.getString("DD_PAYABLE_BANK");
totExp = rs.getInt("TOT_EXP");
pfNo = rs.getString("PF_NO");
fpfNo = rs.getString("FPF_NO");
esicNo = rs.getString("ESIC_NO");
itNo = rs.getString("IT_NO");
basic = rs.getInt("BASIC");
gross = rs.getInt("GROSS");
hobby1 = rs.getString("HOBBY1");
hobby2 = rs.getString("HOBBY2");
hobby3 = rs.getString("HOBBY3");
hobby4 = rs.getString("HOBBY4");
otherInfo = rs.getString("OTHER_INFO");
projCode = rs.getString("PROJ_CODE");
deputeNo = rs.getString("DEPUTE_NO");
rating = rs.getString("RATING");
trainingPrd = rs.getInt("TRAINING_PRD");
probationDate = rs.getTimestamp("PROBATION_DATE");
probationPrd = rs.getInt("PROBATION_PRD");
probation = rs.getString("PROBATION");
dateConf = rs.getTimestamp("DATE_CONF");
confirmed = rs.getString("CONFIRMED");
noticePrd = rs.getInt("NOTICE_PRD");
residate = rs.getTimestamp("RESI_DATE");
relieve_Date = rs.getTimestamp("RELIEVE_DATE");
empCodeLink = rs.getString("EMP_CODE__LINK");
acctCodeSal = rs.getString("ACCT_CODE__SAL");
cctrCodeSal = rs.getString("CCTR_CODE__SAL");
alterCode = rs.getString("ALTER_CODE");
withHeld = rs.getString("WITH_HELD");
apprNoLast = rs.getString("APPR_NO__LAST");
statusEmp = rs.getString("STATUS");
chgDate = rs.getTimestamp("CHG_DATE");
chgUser = rs.getString("CHG_USER");
chgTerm = rs.getString("CHG_TERM");
shortName = rs.getString("SHORT_NAME");
stanCodeHq = rs.getString("STAN_CODE__HQ");
procGroup = rs.getString("PROC_GROUP");
contactAdd1 = rs.getString("CONTACT_ADD1");
contactAdd2 = rs.getString("CONTACT_ADD2");
contactAdd3 = rs.getString("CONTACT_ADD3");
contactCity = rs.getString("CONTACT_CITY");
contactState = rs.getString("CONTACT_STATE");
contactPin = rs.getString("CONTACT_PIN");
contactTel = rs.getString("CONTACT_TEL");
noticePeriod = rs.getInt("NOTICE_PERIOD");
designCode = rs.getString("DESIGN_CODE");
siteCodePayment = rs.getString("SITE_CODE__PAYMENT");
siteCodeIBCA = rs.getString("SITE_CODE__IBCA");
mobileNo = rs.getString("MOBILE_NO");
smsDomain = rs.getString("SMS_DOMAIN");
emailIDoff = rs.getString("EMAIL_ID_OFF");
emailIDPer = rs.getString("EMAIL_ID_PER");
reportToAdmin = rs.getString("REPORT_TO__ADMIN");
funcGroup = rs.getString("FUNC_GROUP");
esiDispensary = rs.getString("ESI_DISPENSARY");
autoAdv = rs.getString("AUTO_ADV");
incrDate = rs.getTimestamp("INCR_DATE");
normalRate = rs.getInt("NORMAL_RATE");
otRate = rs.getInt("OT_RATE");
maidenName = rs.getString("MAIDEN_NAME");
birthPlace = rs.getString("BIRTH_PLACE");
resiPermitNo = rs.getString("RESI_PERMIT_NO");
resiPermitUpto = rs.getTimestamp("RESI_PERMIT_UPTO");
socialSecNo = rs.getString("SOCIAL_SECURITY_NO");
patternCode = rs.getString("PATTERN_CODE");
gratuityDate = rs.getTimestamp("GRATUITY_DATE");
periodCode = rs.getString("PERIOD_CODE");
eligibleOt = rs.getString("ELIGIBLE_OT");
standbyMode = rs.getString("STANDBY_MODE");
workTblNo = rs.getString("WORK_TBLNO");
suppCodeCon = rs.getString("SUPP_CODE__CON");
shiftIndex = rs.getInt("SHIFT_INDEX");
occupCode = rs.getString("OCCUPATION_CODE");
empClass = rs.getString("EMP_CLASS");
imeNo = rs.getString("IME_NO");
pensionScheme = rs.getString("PENSION_SCHEME");
posCode = rs.getString("POS_CODE");
workCtr = rs.getString("WORK_CTR");
bondPrd = rs.getInt("BOND_PRD");
BondAmt = rs.getInt("BOND_AMT");
empCodeHod = rs.getString("EMP_CODE__HOD");
passportNo = rs.getString("PASSPORT_NO");
dateOfIssue = rs.getTimestamp("DATE_OF_ISSUE");
placeOfIssue = rs.getString("PLACE_OF_ISSUE");
validUpto = rs.getTimestamp("VALID_UPTO");
addr1Pass = rs.getString("ADDR1__PASS");
addr2Pass = rs.getString("ADDR2__PASS");
addr3Pass = rs.getString("ADDR3__PASS");
cityPass = rs.getString("CITY__PASS");
stateCodePass = rs.getString("STATE_CODE__PASS");
pinPass = rs.getString("PIN__PASS");
uanNo = rs.getString("UAN_NO");
insiderTradingOpt = rs.getString("INSIDER_TRADING_OPT");
user_Id = rs.getString("USER_ID");
workLocCode = rs.getString("WORK_LOC_CODE");
parentDept = rs.getString("PARENT_DEPT");
extNo = rs.getString("EXT_NO");
adharCardNo = rs.getString("AADHAR_CARD_NO");
electionNo = rs.getString("ELECTION_CARD_NO");
drivLicNo = rs.getString("DRIV_LIC_NO");
drivLicUpto = rs.getTimestamp("DRIV_LIC_VALID_UPTO");
physicalHandicap = rs.getString("PHYSICAL_HANDICAP");
handicapCategory = rs.getString("HANDICAP_CATEGORY");
pfUan = rs.getString("PF_UAN");
grpMediclaim = rs.getString("GROUP_MEDICLAIM");
pensionEligible = rs.getString("PENSION_ELIGIBLE");
IFSC = rs.getString("IFSC");
buCode = rs.getString("BU_CODE");
bondAmtReco = rs.getInt("BOND_AMT__RECO");
contactId = rs.getString("CONTACT_ID");
empCodeAprv = rs.getString("EMP_CODE__APRV");
confDate = rs.getTimestamp("CONF_DATE");
uuid = rs.getString("UUID");
empCodeFunchead = rs.getString("EMP_CODE__FUNCHEAD");
motherTongue = rs.getString("MOTHER_TONGUE");
castCategory = rs.getString("CAST_CATEGORY");
countCodeBirth = rs.getString("COUNT_CODE__BIRTH");
jobTitle = rs.getString("JOB_TITLE");
empIdexternal = rs.getString("EMP_ID_EXTERNAL");
empFnameLong = rs.getString("EMP_FNAME_LONG");
empMnameLong = rs.getString("EMP_MNAME_LONG");
empLnameLong = rs.getString("EMP_LNAME_LONG");
zoneCode = rs.getString("ZONECODE");
teamCode = rs.getString("TEAMCODE");
designationID = rs.getInt("DESIGNATIONID");
regionID = rs.getInt("REGIONID");
hqid = rs.getString("HQID");
shName = rs.getString("SH_NAME");
currGeoPos = rs.getString("CURR_GEO_POS");
perGeoPos = rs.getString("PER_GEO_POS");
revisionNo = rs.getInt("REVISION_NO");
retirementAge = rs.getInt("RETIREMENT_AGE");
retirementDate = rs.getTimestamp("RETIREMENT_DATE");
fetchEmpMap.put("EMP_CODE" , checkNull(emp_Code));
fetchEmpMap.put("CONTACT_CODE" , checkNull(contactCode));
fetchEmpMap.put("EMP_FNAME" , checkNull(empFName));
fetchEmpMap.put("EMP_MNAME" , checkNull(empMName));
fetchEmpMap.put("EMP_LNAME" , checkNull(empLName));
fetchEmpMap.put("NAME_PREFIX" , checkNull(namePrefix));
fetchEmpMap.put("EMP_TYPE" , checkNull(empType));
fetchEmpMap.put("DESIGNATION" , checkNull(designation));
fetchEmpMap.put("DEPT_CODE" , checkNull(deptCode));
fetchEmpMap.put("GRADE" , checkNull(grade));
fetchEmpMap.put("CADRE" , checkNull(cadre));
fetchEmpMap.put("REPORT_TO" , checkNull(reportTo));
fetchEmpMap.put("CUR_ADD1" , checkNull(curAdd1));
fetchEmpMap.put("CUR_ADD2" , checkNull(curAdd2));
fetchEmpMap.put("CUR_ADD3" , checkNull(curAdd3));
fetchEmpMap.put("CUR_CITY" , checkNull(curCity));
fetchEmpMap.put("CUR_STATE" , checkNull(curState));
fetchEmpMap.put("CUR_PIN" , checkNull(curPin));
fetchEmpMap.put("CUR_TEL1" , checkNull(curTel1));
fetchEmpMap.put("CUR_TEL2" , checkNull(curTel2));
fetchEmpMap.put("CUR_TEL3" , checkNull(curTel3));
fetchEmpMap.put("PER_ADD1" , checkNull(perAdd1));
fetchEmpMap.put("PER_ADD2" , checkNull(perAdd2));
fetchEmpMap.put("PER_ADD3" , checkNull(perAdd3));
fetchEmpMap.put("PER_CITY" , checkNull(perCity));
fetchEmpMap.put("PER_STATE" , checkNull(perState));
fetchEmpMap.put("PER_PIN" , checkNull(perPin));
fetchEmpMap.put("PER_TEL" , checkNull(perTel));
fetchEmpMap.put("SEX" , checkNull(sex));
fetchEmpMap.put("NATIONALITY" , checkNull(nationality));
fetchEmpMap.put("CITIZEN" , checkNull(citizen));
fetchEmpMap.put("STATE_CODE__DOMICILE" , checkNull(stateCodeDomicile));
fetchEmpMap.put("M_STATUS" , checkNull(mStatus));
fetchEmpMap.put("M_STATUS_DATE" , mStatusDate);
fetchEmpMap.put("BIRTH_DATE" , birthDate);
fetchEmpMap.put("BLOOD_GRP" , checkNull(bloodGrp));
fetchEmpMap.put("CONTACT_PERS" , checkNull(contactPers));
fetchEmpMap.put("RELIGION" , checkNull(religion));
fetchEmpMap.put("JOINED_AS" , checkNull(joinedAs));
fetchEmpMap.put("DATE_JOIN" , dateJoin);
fetchEmpMap.put("MODE_APP" , checkNull(modeApp));
fetchEmpMap.put("WORK_SHIFT" , checkNull(workShift));
fetchEmpMap.put("SHIFT_ROT" , checkNull(shiftRot));
fetchEmpMap.put("HOL_TBLNO" , checkNull(holTblNo));
fetchEmpMap.put("PAY_TYPE" , checkNull(payType));
fetchEmpMap.put("PAY_MODE" , checkNull(payMode));
fetchEmpMap.put("EMP_SITE" , checkNull(emp_Site));
fetchEmpMap.put("PAY_SITE" , checkNull(paySite));
fetchEmpMap.put("WORK_SITE" , checkNull(workSite));
fetchEmpMap.put("BANK_CODE" , checkNull(bankCode));
fetchEmpMap.put("BANK_ACCT" , checkNull(bankAcct));
fetchEmpMap.put("STAN_CODE" , checkNull(stanCode));
fetchEmpMap.put("DD_PAYABLE_BANK" , checkNull(ddPayableBank));
fetchEmpMap.put("TOT_EXP" , totExp);
fetchEmpMap.put("PF_NO" , checkNull(pfNo));
fetchEmpMap.put("FPF_NO" , checkNull(fpfNo));
fetchEmpMap.put("ESIC_NO" , checkNull(esicNo));
fetchEmpMap.put("IT_NO" , checkNull(itNo));
fetchEmpMap.put("BASIC" , basic);
fetchEmpMap.put("GROSS" , gross);
fetchEmpMap.put("HOBBY1" , checkNull(hobby1));
fetchEmpMap.put("HOBBY2" , checkNull(hobby2));
fetchEmpMap.put("HOBBY3" , checkNull(hobby3));
fetchEmpMap.put("HOBBY4" , checkNull(hobby4));
fetchEmpMap.put("OTHER_INFO" , checkNull(otherInfo));
fetchEmpMap.put("PROJ_CODE" , checkNull(projCode));
fetchEmpMap.put("DEPUTE_NO" , checkNull(deputeNo));
fetchEmpMap.put("RATING" , checkNull(rating));
fetchEmpMap.put("TRAINING_PRD" ,trainingPrd);
fetchEmpMap.put("PROBATION_DATE" , probationDate);
fetchEmpMap.put("PROBATION_PRD" , probationPrd);
fetchEmpMap.put("PROBATION" , checkNull(probation));
fetchEmpMap.put("DATE_CONF" , dateConf);
fetchEmpMap.put("CONFIRMED" , checkNull(confirmed));
fetchEmpMap.put("NOTICE_PRD" , noticePrd);
fetchEmpMap.put("RESI_DATE" , residate);
fetchEmpMap.put("RELIEVE_DATE" , relieve_Date);
fetchEmpMap.put("EMP_CODE__LINK" , checkNull(empCodeLink));
fetchEmpMap.put("ACCT_CODE__SAL" ,checkNull(acctCodeSal));
fetchEmpMap.put("CCTR_CODE__SAL" , checkNull(cctrCodeSal));
fetchEmpMap.put("ALTER_CODE" , checkNull(alterCode));
fetchEmpMap.put("WITH_HELD" , checkNull(withHeld));
fetchEmpMap.put("APPR_NO__LAST" , checkNull(apprNoLast));
fetchEmpMap.put("STATUS" , checkNull(statusEmp));
fetchEmpMap.put("CHG_DATE" , chgDate);
fetchEmpMap.put("CHG_USER" , checkNull(chgUser));
fetchEmpMap.put("CHG_TERM" , checkNull(chgTerm));
fetchEmpMap.put("SHORT_NAME" , checkNull(shortName));
fetchEmpMap.put("STAN_CODE__HQ" , checkNull(stanCodeHq));
fetchEmpMap.put("PROC_GROUP" ,checkNull(procGroup));
fetchEmpMap.put("CONTACT_ADD1" , checkNull(contactAdd1));
fetchEmpMap.put("CONTACT_ADD2" , checkNull(contactAdd2));
fetchEmpMap.put("CONTACT_ADD3" , checkNull(contactAdd3));
fetchEmpMap.put("CONTACT_CITY" , checkNull(contactCity));
fetchEmpMap.put("CONTACT_STATE" , checkNull(contactState));
fetchEmpMap.put("CONTACT_PIN" , checkNull(contactPin));
fetchEmpMap.put("CONTACT_TEL" , checkNull(contactTel));
fetchEmpMap.put("NOTICE_PERIOD" , noticePeriod);
fetchEmpMap.put("DESIGN_CODE" , checkNull(designCode));
fetchEmpMap.put("SITE_CODE__PAYMENT" , checkNull(siteCodePayment));
fetchEmpMap.put("SITE_CODE__IBCA" , checkNull(siteCodeIBCA));
fetchEmpMap.put("MOBILE_NO" , checkNull(mobileNo));
fetchEmpMap.put("SMS_DOMAIN" , checkNull(smsDomain));
fetchEmpMap.put("EMAIL_ID_OFF" , checkNull(emailIDoff));
fetchEmpMap.put("EMAIL_ID_PER" , checkNull(emailIDPer));
fetchEmpMap.put("REPORT_TO__ADMIN" , checkNull(reportToAdmin));
fetchEmpMap.put("FUNC_GROUP" , checkNull(funcGroup));
fetchEmpMap.put("ESI_DISPENSARY" , checkNull(esiDispensary));
fetchEmpMap.put("AUTO_ADV" , checkNull(autoAdv));
fetchEmpMap.put("INCR_DATE" , incrDate);
fetchEmpMap.put("NORMAL_RATE" ,normalRate);
fetchEmpMap.put("OT_RATE" , otRate);
fetchEmpMap.put("MAIDEN_NAME" , checkNull(maidenName));
fetchEmpMap.put("BIRTH_PLACE" , checkNull(birthPlace));
fetchEmpMap.put("RESI_PERMIT_NO" , checkNull(resiPermitNo));
fetchEmpMap.put("RESI_PERMIT_UPTO" , resiPermitUpto);
fetchEmpMap.put("SOCIAL_SECURITY_NO" , checkNull(socialSecNo));
fetchEmpMap.put("PATTERN_CODE" , checkNull(patternCode));
fetchEmpMap.put("GRATUITY_DATE" ,gratuityDate);
fetchEmpMap.put("PERIOD_CODE" , checkNull(periodCode));
fetchEmpMap.put("ELIGIBLE_OT" , checkNull(eligibleOt));
fetchEmpMap.put("STANDBY_MODE" , checkNull(standbyMode));
fetchEmpMap.put("WORK_TBLNO" , checkNull(workTblNo));
fetchEmpMap.put("SUPP_CODE__CON" , checkNull(suppCodeCon));
fetchEmpMap.put("SHIFT_INDEX" , shiftIndex);
fetchEmpMap.put("OCCUPATION_CODE" , checkNull(occupCode));
fetchEmpMap.put("EMP_CLASS" , checkNull(empClass));
fetchEmpMap.put("IME_NO" , checkNull(imeNo));
fetchEmpMap.put("PENSION_SCHEME" , checkNull(pensionScheme));
fetchEmpMap.put("POS_CODE" , checkNull(posCode));
fetchEmpMap.put("WORK_CTR" ,checkNull(workCtr));
fetchEmpMap.put("BOND_PRD" , bondPrd);
fetchEmpMap.put("BOND_AMT" , BondAmt);
fetchEmpMap.put("EMP_CODE__HOD" , checkNull(empCodeHod));
fetchEmpMap.put("PASSPORT_NO" , checkNull(passportNo));
fetchEmpMap.put("DATE_OF_ISSUE" , dateOfIssue);
fetchEmpMap.put("PLACE_OF_ISSUE" ,checkNull( placeOfIssue));
fetchEmpMap.put("VALID_UPTO" , validUpto);
fetchEmpMap.put("ADDR1__PASS" , checkNull(addr1Pass));
fetchEmpMap.put("ADDR2__PASS" , checkNull(addr2Pass));
fetchEmpMap.put("ADDR3__PASS" , checkNull(addr3Pass));
fetchEmpMap.put("CITY__PASS" ,checkNull(cityPass));
fetchEmpMap.put("STATE_CODE__PASS" , checkNull(stateCodePass));
fetchEmpMap.put("PIN__PASS" , checkNull(pinPass));
fetchEmpMap.put("UAN_NO" , checkNull(uanNo));
fetchEmpMap.put("INSIDER_TRADING_OPT" , checkNull(insiderTradingOpt));
fetchEmpMap.put("USER_ID" , checkNull(user_Id));
fetchEmpMap.put("WORK_LOC_CODE" , checkNull(workLocCode));
fetchEmpMap.put("PARENT_DEPT" , checkNull(parentDept));
fetchEmpMap.put("EXT_NO" , checkNull(extNo));
fetchEmpMap.put("AADHAR_CARD_NO" , checkNull(adharCardNo));
fetchEmpMap.put("ELECTION_CARD_NO" , checkNull(electionNo));
fetchEmpMap.put("DRIV_LIC_NO" , checkNull(drivLicNo));
fetchEmpMap.put("DRIV_LIC_VALID_UPTO" , drivLicUpto);
fetchEmpMap.put("PHYSICAL_HANDICAP" , checkNull(physicalHandicap));
fetchEmpMap.put("HANDICAP_CATEGORY" , checkNull(handicapCategory));
fetchEmpMap.put("PF_UAN" , checkNull(pfUan));
fetchEmpMap.put("GROUP_MEDICLAIM" , checkNull(grpMediclaim));
fetchEmpMap.put("PENSION_ELIGIBLE" , checkNull(pensionEligible));
fetchEmpMap.put("IFSC" , checkNull(IFSC));
fetchEmpMap.put("BU_CODE" , checkNull(buCode));
fetchEmpMap.put("BOND_AMT__RECO" , bondAmtReco);
fetchEmpMap.put("CONTACT_ID" , checkNull(contactId));
fetchEmpMap.put("EMP_CODE__APRV" , checkNull(empCodeAprv));
fetchEmpMap.put("CONF_DATE" , confDate);
fetchEmpMap.put("UUID" , checkNull(uuid));
fetchEmpMap.put("EMP_CODE__FUNCHEAD" , checkNull(empCodeFunchead));
fetchEmpMap.put("MOTHER_TONGUE" , checkNull(motherTongue));
fetchEmpMap.put("CAST_CATEGORY" , checkNull(castCategory));
fetchEmpMap.put("COUNT_CODE__BIRTH" , checkNull(countCodeBirth));
fetchEmpMap.put("JOB_TITLE" , checkNull(jobTitle));
fetchEmpMap.put("EMP_ID_EXTERNAL" , checkNull(empIdexternal));
fetchEmpMap.put("EMP_FNAME_LONG" , checkNull(empFnameLong));
fetchEmpMap.put("EMP_MNAME_LONG" , checkNull(empMnameLong));
fetchEmpMap.put("EMP_LNAME_LONG" , checkNull(empLnameLong));
fetchEmpMap.put("ZONECODE" , checkNull(zoneCode));
fetchEmpMap.put("TEAMCODE" , checkNull(teamCode));
fetchEmpMap.put("DESIGNATIONID" , designationID);
fetchEmpMap.put("REGIONID" , regionID);
fetchEmpMap.put("HQID" , checkNull(hqid));
fetchEmpMap.put("SH_NAME" , checkNull(shName));
fetchEmpMap.put("CURR_GEO_POS" , checkNull(currGeoPos));
fetchEmpMap.put("PER_GEO_POS" , checkNull(perGeoPos));
fetchEmpMap.put("REVISION_NO" , revisionNo);
fetchEmpMap.put("RETIREMENT_AGE" , retirementAge);
fetchEmpMap.put("RETIREMENT_DATE" , retirementDate);
}
else
{
//fetchEmpMap = null;
fetchEmpMap.put("EMP_CODE" , checkNull(emp_Code));
fetchEmpMap.put("CONTACT_CODE" , checkNull(contactCode));
fetchEmpMap.put("EMP_FNAME" , checkNull(empFName));
fetchEmpMap.put("EMP_MNAME" , checkNull(empMName));
fetchEmpMap.put("EMP_LNAME" , checkNull(empLName));
fetchEmpMap.put("NAME_PREFIX" , checkNull(namePrefix));
fetchEmpMap.put("EMP_TYPE" , checkNull(empType));
fetchEmpMap.put("DESIGNATION" , checkNull(designation));
fetchEmpMap.put("DEPT_CODE" , checkNull(deptCode));
fetchEmpMap.put("GRADE" , checkNull(grade));
fetchEmpMap.put("CADRE" , checkNull(cadre));
fetchEmpMap.put("REPORT_TO" , checkNull(reportTo));
fetchEmpMap.put("CUR_ADD1" , checkNull(curAdd1));
fetchEmpMap.put("CUR_ADD2" , checkNull(curAdd2));
fetchEmpMap.put("CUR_ADD3" , checkNull(curAdd3));
fetchEmpMap.put("CUR_CITY" , checkNull(curCity));
fetchEmpMap.put("CUR_STATE" , checkNull(curState));
fetchEmpMap.put("CUR_PIN" , checkNull(curPin));
fetchEmpMap.put("CUR_TEL1" , checkNull(curTel1));
fetchEmpMap.put("CUR_TEL2" , checkNull(curTel2));
fetchEmpMap.put("CUR_TEL3" , checkNull(curTel3));
fetchEmpMap.put("PER_ADD1" , checkNull(perAdd1));
fetchEmpMap.put("PER_ADD2" , checkNull(perAdd2));
fetchEmpMap.put("PER_ADD3" , checkNull(perAdd3));
fetchEmpMap.put("PER_CITY" , checkNull(perCity));
fetchEmpMap.put("PER_STATE" , checkNull(perState));
fetchEmpMap.put("PER_PIN" , checkNull(perPin));
fetchEmpMap.put("PER_TEL" , checkNull(perTel));
fetchEmpMap.put("SEX" , checkNull(sex));
fetchEmpMap.put("NATIONALITY" , checkNull(nationality));
fetchEmpMap.put("CITIZEN" , checkNull(citizen));
fetchEmpMap.put("STATE_CODE__DOMICILE" , checkNull(stateCodeDomicile));
fetchEmpMap.put("M_STATUS" , checkNull(mStatus));
fetchEmpMap.put("M_STATUS_DATE" , mStatusDate);
fetchEmpMap.put("BIRTH_DATE" , birthDate);
fetchEmpMap.put("BLOOD_GRP" , checkNull(bloodGrp));
fetchEmpMap.put("CONTACT_PERS" , checkNull(contactPers));
fetchEmpMap.put("RELIGION" , checkNull(religion));
fetchEmpMap.put("JOINED_AS" , checkNull(joinedAs));
fetchEmpMap.put("DATE_JOIN" , dateJoin);
fetchEmpMap.put("MODE_APP" , checkNull(modeApp));
fetchEmpMap.put("WORK_SHIFT" , checkNull(workShift));
fetchEmpMap.put("SHIFT_ROT" , checkNull(shiftRot));
fetchEmpMap.put("HOL_TBLNO" , checkNull(holTblNo));
fetchEmpMap.put("PAY_TYPE" , checkNull(payType));
fetchEmpMap.put("PAY_MODE" , checkNull(payMode));
fetchEmpMap.put("EMP_SITE" , checkNull(emp_Site));
fetchEmpMap.put("PAY_SITE" , checkNull(paySite));
fetchEmpMap.put("WORK_SITE" , checkNull(workSite));
fetchEmpMap.put("BANK_CODE" , checkNull(bankCode));
fetchEmpMap.put("BANK_ACCT" , checkNull(bankAcct));
fetchEmpMap.put("STAN_CODE" , checkNull(stanCode));
fetchEmpMap.put("DD_PAYABLE_BANK" , checkNull(ddPayableBank));
fetchEmpMap.put("TOT_EXP" , totExp);
fetchEmpMap.put("PF_NO" , checkNull(pfNo));
fetchEmpMap.put("FPF_NO" , checkNull(fpfNo));
fetchEmpMap.put("ESIC_NO" , checkNull(esicNo));
fetchEmpMap.put("IT_NO" , checkNull(itNo));
fetchEmpMap.put("BASIC" , basic);
fetchEmpMap.put("GROSS" , gross);
fetchEmpMap.put("HOBBY1" , checkNull(hobby1));
fetchEmpMap.put("HOBBY2" , checkNull(hobby2));
fetchEmpMap.put("HOBBY3" , checkNull(hobby3));
fetchEmpMap.put("HOBBY4" , checkNull(hobby4));
fetchEmpMap.put("OTHER_INFO" , checkNull(otherInfo));
fetchEmpMap.put("PROJ_CODE" , checkNull(projCode));
fetchEmpMap.put("DEPUTE_NO" , checkNull(deputeNo));
fetchEmpMap.put("RATING" , checkNull(rating));
fetchEmpMap.put("TRAINING_PRD" ,trainingPrd);
fetchEmpMap.put("PROBATION_DATE" , probationDate);
fetchEmpMap.put("PROBATION_PRD" , probationPrd);
fetchEmpMap.put("PROBATION" , checkNull(probation));
fetchEmpMap.put("DATE_CONF" , dateConf);
fetchEmpMap.put("CONFIRMED" , checkNull(confirmed));
fetchEmpMap.put("NOTICE_PRD" , noticePrd);
fetchEmpMap.put("RESI_DATE" , residate);
fetchEmpMap.put("RELIEVE_DATE" , relieve_Date);
fetchEmpMap.put("EMP_CODE__LINK" , checkNull(empCodeLink));
fetchEmpMap.put("ACCT_CODE__SAL" ,checkNull(acctCodeSal));
fetchEmpMap.put("CCTR_CODE__SAL" , checkNull(cctrCodeSal));
fetchEmpMap.put("ALTER_CODE" , checkNull(alterCode));
fetchEmpMap.put("WITH_HELD" , checkNull(withHeld));
fetchEmpMap.put("APPR_NO__LAST" , checkNull(apprNoLast));
fetchEmpMap.put("STATUS" , checkNull(statusEmp));
fetchEmpMap.put("CHG_DATE" , chgDate);
fetchEmpMap.put("CHG_USER" , checkNull(chgUser));
fetchEmpMap.put("CHG_TERM" , checkNull(chgTerm));
fetchEmpMap.put("SHORT_NAME" , checkNull(shortName));
fetchEmpMap.put("STAN_CODE__HQ" , checkNull(stanCodeHq));
fetchEmpMap.put("PROC_GROUP" ,checkNull(procGroup));
fetchEmpMap.put("CONTACT_ADD1" , checkNull(contactAdd1));
fetchEmpMap.put("CONTACT_ADD2" , checkNull(contactAdd2));
fetchEmpMap.put("CONTACT_ADD3" , checkNull(contactAdd3));
fetchEmpMap.put("CONTACT_CITY" , checkNull(contactCity));
fetchEmpMap.put("CONTACT_STATE" , checkNull(contactState));
fetchEmpMap.put("CONTACT_PIN" , checkNull(contactPin));
fetchEmpMap.put("CONTACT_TEL" , checkNull(contactTel));
fetchEmpMap.put("NOTICE_PERIOD" , noticePeriod);
fetchEmpMap.put("DESIGN_CODE" , checkNull(designCode));
fetchEmpMap.put("SITE_CODE__PAYMENT" , checkNull(siteCodePayment));
fetchEmpMap.put("SITE_CODE__IBCA" , checkNull(siteCodeIBCA));
fetchEmpMap.put("MOBILE_NO" , checkNull(mobileNo));
fetchEmpMap.put("SMS_DOMAIN" , checkNull(smsDomain));
fetchEmpMap.put("EMAIL_ID_OFF" , checkNull(emailIDoff));
fetchEmpMap.put("EMAIL_ID_PER" , checkNull(emailIDPer));
fetchEmpMap.put("REPORT_TO__ADMIN" , checkNull(reportToAdmin));
fetchEmpMap.put("FUNC_GROUP" , checkNull(funcGroup));
fetchEmpMap.put("ESI_DISPENSARY" , checkNull(esiDispensary));
fetchEmpMap.put("AUTO_ADV" , checkNull(autoAdv));
fetchEmpMap.put("INCR_DATE" , incrDate);
fetchEmpMap.put("NORMAL_RATE" ,normalRate);
fetchEmpMap.put("OT_RATE" , otRate);
fetchEmpMap.put("MAIDEN_NAME" , checkNull(maidenName));
fetchEmpMap.put("BIRTH_PLACE" , checkNull(birthPlace));
fetchEmpMap.put("RESI_PERMIT_NO" , checkNull(resiPermitNo));
fetchEmpMap.put("RESI_PERMIT_UPTO" , resiPermitUpto);
fetchEmpMap.put("SOCIAL_SECURITY_NO" , checkNull(socialSecNo));
fetchEmpMap.put("PATTERN_CODE" , checkNull(patternCode));
fetchEmpMap.put("GRATUITY_DATE" ,gratuityDate);
fetchEmpMap.put("PERIOD_CODE" , checkNull(periodCode));
fetchEmpMap.put("ELIGIBLE_OT" , checkNull(eligibleOt));
fetchEmpMap.put("STANDBY_MODE" , checkNull(standbyMode));
fetchEmpMap.put("WORK_TBLNO" , checkNull(workTblNo));
fetchEmpMap.put("SUPP_CODE__CON" , checkNull(suppCodeCon));
fetchEmpMap.put("SHIFT_INDEX" , shiftIndex);
fetchEmpMap.put("OCCUPATION_CODE" , checkNull(occupCode));
fetchEmpMap.put("EMP_CLASS" , checkNull(empClass));
fetchEmpMap.put("IME_NO" , checkNull(imeNo));
fetchEmpMap.put("PENSION_SCHEME" , checkNull(pensionScheme));
fetchEmpMap.put("POS_CODE" , checkNull(posCode));
fetchEmpMap.put("WORK_CTR" ,checkNull(workCtr));
fetchEmpMap.put("BOND_PRD" , bondPrd);
fetchEmpMap.put("BOND_AMT" , BondAmt);
fetchEmpMap.put("EMP_CODE__HOD" , checkNull(empCodeHod));
fetchEmpMap.put("PASSPORT_NO" , checkNull(passportNo));
fetchEmpMap.put("DATE_OF_ISSUE" , dateOfIssue);
fetchEmpMap.put("PLACE_OF_ISSUE" ,checkNull( placeOfIssue));
fetchEmpMap.put("VALID_UPTO" , validUpto);
fetchEmpMap.put("ADDR1__PASS" , checkNull(addr1Pass));
fetchEmpMap.put("ADDR2__PASS" , checkNull(addr2Pass));
fetchEmpMap.put("ADDR3__PASS" , checkNull(addr3Pass));
fetchEmpMap.put("CITY__PASS" ,checkNull(cityPass));
fetchEmpMap.put("STATE_CODE__PASS" , checkNull(stateCodePass));
fetchEmpMap.put("PIN__PASS" , checkNull(pinPass));
fetchEmpMap.put("UAN_NO" , checkNull(uanNo));
fetchEmpMap.put("INSIDER_TRADING_OPT" , checkNull(insiderTradingOpt));
fetchEmpMap.put("USER_ID" , checkNull(user_Id));
fetchEmpMap.put("WORK_LOC_CODE" , checkNull(workLocCode));
fetchEmpMap.put("PARENT_DEPT" , checkNull(parentDept));
fetchEmpMap.put("EXT_NO" , checkNull(extNo));
fetchEmpMap.put("AADHAR_CARD_NO" , checkNull(adharCardNo));
fetchEmpMap.put("ELECTION_CARD_NO" , checkNull(electionNo));
fetchEmpMap.put("DRIV_LIC_NO" , checkNull(drivLicNo));
fetchEmpMap.put("DRIV_LIC_VALID_UPTO" , drivLicUpto);
fetchEmpMap.put("PHYSICAL_HANDICAP" , checkNull(physicalHandicap));
fetchEmpMap.put("HANDICAP_CATEGORY" , checkNull(handicapCategory));
fetchEmpMap.put("PF_UAN" , checkNull(pfUan));
fetchEmpMap.put("GROUP_MEDICLAIM" , checkNull(grpMediclaim));
fetchEmpMap.put("PENSION_ELIGIBLE" , checkNull(pensionEligible));
fetchEmpMap.put("IFSC" , checkNull(IFSC));
fetchEmpMap.put("BU_CODE" , checkNull(buCode));
fetchEmpMap.put("BOND_AMT__RECO" , bondAmtReco);
fetchEmpMap.put("CONTACT_ID" , checkNull(contactId));
fetchEmpMap.put("EMP_CODE__APRV" , checkNull(empCodeAprv));
fetchEmpMap.put("CONF_DATE" , confDate);
fetchEmpMap.put("UUID" , checkNull(uuid));
fetchEmpMap.put("EMP_CODE__FUNCHEAD" , checkNull(empCodeFunchead));
fetchEmpMap.put("MOTHER_TONGUE" , checkNull(motherTongue));
fetchEmpMap.put("CAST_CATEGORY" , checkNull(castCategory));
fetchEmpMap.put("COUNT_CODE__BIRTH" , checkNull(countCodeBirth));
fetchEmpMap.put("JOB_TITLE" , checkNull(jobTitle));
fetchEmpMap.put("EMP_ID_EXTERNAL" , checkNull(empIdexternal));
fetchEmpMap.put("EMP_FNAME_LONG" , checkNull(empFnameLong));
fetchEmpMap.put("EMP_MNAME_LONG" , checkNull(empMnameLong));
fetchEmpMap.put("EMP_LNAME_LONG" , checkNull(empLnameLong));
fetchEmpMap.put("ZONECODE" , checkNull(zoneCode));
fetchEmpMap.put("TEAMCODE" , checkNull(teamCode));
fetchEmpMap.put("DESIGNATIONID" , designationID);
fetchEmpMap.put("REGIONID" , regionID);
fetchEmpMap.put("HQID" , checkNull(hqid));
fetchEmpMap.put("SH_NAME" , checkNull(shName));
fetchEmpMap.put("CURR_GEO_POS" , checkNull(currGeoPos));
fetchEmpMap.put("PER_GEO_POS" , checkNull(perGeoPos));
fetchEmpMap.put("REVISION_NO" , revisionNo);
fetchEmpMap.put("RETIREMENT_AGE" , retirementAge);
fetchEmpMap.put("RETIREMENT_DATE" , retirementDate);
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null ;
}
System.out.println("fetchEmpMap:::::" +fetchEmpMap);
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try {
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null ;
}
}
catch (SQLException e) {
e.printStackTrace();
}
}
System.out.println("Final HashMap fetchEmpMap from fetchEmpMstInfo :::::" +fetchEmpMap);
return fetchEmpMap;
}
//Added by Poonam B[02/12/2019][END][method to get employee information]
//Modified by Sana on [25-11-2015][Request ID: A15JSUN006 - To add gbfEmp during migration of Employee Seperation in java][End] //Modified by Sana on [25-11-2015][Request ID: A15JSUN006 - To add gbfEmp during migration of Employee Seperation in java][End]
//Modified by Juhi on 04-05-2016 [A15JSUN007] [To display error message as xml string] [START] //Modified by Juhi on 04-05-2016 [A15JSUN007] [To display error message as xml string] [START]
/** /**
...@@ -5303,8 +6280,10 @@ public class AdmCommon ...@@ -5303,8 +6280,10 @@ public class AdmCommon
try try
{ {
int pos1 = Integer.parseInt(value)-1; int pos1 = Integer.parseInt(value)-1;
// Modified by Poonam B[27/11/2019][START][To avoid Casting error]
//double data = (double) envVarNum.get(pos1); //double data = (double) envVarNum.get(pos1);
double data = ((Double) envVarNum.get(pos1)).doubleValue(); double data = ((Double) envVarNum.get(pos1)).doubleValue();
// Modified by Poonam B[27/11/2019][END][To avoid Casting error]
pstmt.setDouble(counter, data); pstmt.setDouble(counter, data);
} }
...@@ -5836,52 +6815,4 @@ public class AdmCommon ...@@ -5836,52 +6815,4 @@ public class AdmCommon
return timeStampValue; return timeStampValue;
} }
//Added By Vikas Lagad on 13-09-2019[To get timestamp value] End //Added By Vikas Lagad on 13-09-2019[To get timestamp value] End
//Added by Varsha V on 28-11-19 as per suggested by Sir
public double gfCallPayrollDdf(String empcode, String prdcode, String proctype, String calctype, double acNewamt, String adcode, Connection conn) throws SQLException, ITMException
{
double retAmt = 0.0;
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
System.out.println("gfCallPayrollDdf Method called");
try
{
sql = "select nvl(ddf_pyrl_calc(?,?,?,?,?,?),0) as ret_amt from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empcode);
pstmt.setString(2, prdcode);
pstmt.setString(3, proctype);
pstmt.setString(4, calctype);
pstmt.setDouble(5, acNewamt);
pstmt.setString(6, adcode);
rs = pstmt.executeQuery();
if(rs.next())
{
retAmt = rs.getDouble("ret_amt");
}
}
catch(Exception e)
{
System.out.println(e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
finally
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
return retAmt;
}
//Ended by Varsha V on 28-11-19 as per suggested by Sir
} }
webitm-adm/src/ibase/webitm/ejb/adm/AttendanceDailyIC.java
View file @ 942f62fb
...@@ -826,7 +826,7 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -826,7 +826,7 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
{ {
userLevelInt = Integer.parseInt(userLevel); userLevelInt = Integer.parseInt(userLevel);
} }
//Added By Poonam B[26/11/2019][ED] //Added By Poonam B[26/11/2019][END]
conn = getConnection(); conn = getConnection();
if(objContext != null && objContext.trim().length() > 0) if(objContext != null && objContext.trim().length() > 0)
{ {
...@@ -948,7 +948,10 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -948,7 +948,10 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
close(rs, pstmt); close(rs, pstmt);
// Modified By Poonam B[26/11/2019][method changed][START] // Modified By Poonam B[26/11/2019][method changed][START]
//errCode = checkNull(admCommon.gbfEmp(mVal, mattdDate, lsSite, loginSite , conn)); //errCode = checkNull(admCommon.gbfEmp(mVal, mattdDate, lsSite, loginSite , conn));
errCode = checkNull(admCommon.chkHRMSiteAccess(mVal, mattdDate, lsSite, loginSite ,userId, userLevelInt , loginEmpCode, "w_"+objName, conn)); // modified by Poonam B[02/12/2019][To remove emp_site variable][START]
//errCode = checkNull(admCommon.chkHRMSiteAccess(mVal, mattdDate, lsSite, loginSite ,userId, userLevelInt , loginEmpCode, "w_"+objName, conn));
errCode = checkNull(admCommon.chkHRMSiteAccess(mVal, mattdDate, loginSite ,userId, userLevelInt , loginEmpCode, objName, conn));
// modified by Poonam B[02/12/2019][To remove emp_site variable][END]
System.out.println("value return from chkHRMSiteAccess::::" +errCode); System.out.println("value return from chkHRMSiteAccess::::" +errCode);
// Modified By Poonam B[26/11/2019][method changed][END] // Modified By Poonam B[26/11/2019][method changed][END]
} }
......
webitm-adm/src/ibase/webitm/ejb/adm/adv/ArrearsDeletePrc.java
View file @ 942f62fb
...@@ -170,7 +170,12 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -170,7 +170,12 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
String userId ="", chgTerm = "",errString = ""; String userId ="", chgTerm = "",errString = "";
boolean isSuccess = false; boolean isSuccess = false;
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
String deleteSql = "", sqlPrd = ""; String deleteSql = "", sqlPrd = "" ;
//Added By Poonam B[02/12/2019][START]
String selectSql = "" , confirmed = "", voucherNo = "";
PreparedStatement pstmtSelect = null;
ResultSet rsSelect = null;
//Added By Poonam B[02/12/2019][END]
Timestamp frDate = null, toDate = null; Timestamp frDate = null, toDate = null;
PreparedStatement pStmt1 = null; PreparedStatement pStmt1 = null;
PreparedStatement pstmt3 = null; // Modified on 16/10/2019 PreparedStatement pstmt3 = null; // Modified on 16/10/2019
...@@ -247,7 +252,10 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -247,7 +252,10 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
hrLogWriter.setCurrentProcess("Arrears Deletion"); hrLogWriter.setCurrentProcess("Arrears Deletion");
hrLogWriter.setActivity("Arrears Deletion"); hrLogWriter.setActivity("Arrears Deletion");
lsLogStr = "Arrears Deletion Process Started"; lsLogStr = "Arrears Deletion Process Started";
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn); //Modified By Poonam B[03/12/2019][START]
//hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, type, lsLogStr, "I", logConn);
//Modified By Poonam B[03/12/2019][END]
} }
} }
else else
...@@ -264,7 +272,10 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -264,7 +272,10 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
hrLogWriter.setCurrentProcess("Payroll Deletion"); hrLogWriter.setCurrentProcess("Payroll Deletion");
hrLogWriter.setActivity("Payroll Deletion"); hrLogWriter.setActivity("Payroll Deletion");
lsLogStr = "Payroll Deletion Process Started"; lsLogStr = "Payroll Deletion Process Started";
hrLogWriter.gbfErrWrite("", "",type, lsLogStr, "I", logConn); //Modified By Poonam B[03/12/2019][START]
//hrLogWriter.gbfErrWrite("", "",type, lsLogStr, "I", logConn);
hrLogWriter.gbfErrWrite(prdCodeFr, empCodeFr, type, lsLogStr, "I", logConn);
//Modified By Poonam B[03/12/2019][END]
} }
} }
//Modified by Poonam B[18/10/2019][END] //Modified by Poonam B[18/10/2019][END]
...@@ -289,6 +300,9 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -289,6 +300,9 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
/* /*
deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')"; deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')";
*/ */
// Modified By Poonam B[02/12/2019][To do select lock][START]
selectSql = "SELECT CONFIRMED , VOUCHER_NO FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( ARREARS.VOUCHER_NO IS NULL ) AND (CASE WHEN ARREARS.CONFIRMED IS NULL THEN 'N' ELSE ARREARS.CONFIRMED END != 'Y') for update nowait";
// Modified By Poonam B[02/12/2019][To do select lock][END]
deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( ARREARS.VOUCHER_NO IS NULL ) AND (CASE WHEN ARREARS.CONFIRMED IS NULL THEN 'N' ELSE ARREARS.CONFIRMED END != 'Y')"; deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( ARREARS.VOUCHER_NO IS NULL ) AND (CASE WHEN ARREARS.CONFIRMED IS NULL THEN 'N' ELSE ARREARS.CONFIRMED END != 'Y')";
// Modified on 16/10/2019.End // Modified on 16/10/2019.End
...@@ -300,8 +314,14 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -300,8 +314,14 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
sql.append("( EMPLOYEE.PROC_GROUP <= ?) AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y'))"); sql.append("( EMPLOYEE.PROC_GROUP <= ?) AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y'))");
deleteSql = "DELETE FROM PAYROLL WHERE PRD_CODE = ? AND EMP_CODE = ? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')"; deleteSql = "DELETE FROM PAYROLL WHERE PRD_CODE = ? AND EMP_CODE = ? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')";
// Modified By Poonam B[02/12/2019][To do select lock][START]
selectSql = "SELECT CONFIRMED , VOUCHER_NO FROM PAYROLL WHERE PRD_CODE = ? AND EMP_CODE = ? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y') for update nowait ";
// Modified By Poonam B[02/12/2019][To do select lock][END]
} }
//Modified By Poonam B[25-SEP-2019][END] //Modified By Poonam B[25-SEP-2019][END]
pStmt1 = con.prepareStatement(deleteSql); pStmt1 = con.prepareStatement(deleteSql);
pStmt = con.prepareStatement(sql.toString()); pStmt = con.prepareStatement(sql.toString());
pStmt.setString(1, prdCodeFr); pStmt.setString(1, prdCodeFr);
...@@ -329,6 +349,37 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -329,6 +349,37 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
} }
System.out.println("###Sai:"+prdCode+"\t"+empCode+"\t"+siteCodePay+"\t"+prcGrp+"\t" + "prdAccountCode\t" +prdAccountCode); System.out.println("###Sai:"+prdCode+"\t"+empCode+"\t"+siteCodePay+"\t"+prcGrp+"\t" + "prdAccountCode\t" +prdAccountCode);
count = 0; count = 0;
//Added By Poonam B[02/12/2019][START]
pstmtSelect = con.prepareStatement(selectSql);
pstmtSelect.setString(1, prdCode);
pstmtSelect.setString(2, empCode);
if("AR".equalsIgnoreCase(type))
{
pstmtSelect.setString(3, prdAccountCode);
}
rsSelect = pstmtSelect.executeQuery();
if(rsSelect.next())
{
confirmed = E12GenericUtility.checkNull(rsSelect.getString("CONFIRMED"));
voucherNo = E12GenericUtility.checkNull(rsSelect.getString("VOUCHER_NO"));
System.out.println("confirmed :::\n " +confirmed + "voucherNo ::::" +voucherNo);
}
if(pstmtSelect != null)
{
pstmtSelect.clearParameters();
}
if("Y".equalsIgnoreCase(confirmed) || (voucherNo != null && voucherNo.trim().length() > 0))
{
errorString = itmdbAccessEJB.getErrorString("", "VTPOST06", userId, "", con); //Already Posted
//Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
//hrLogWriter.gbfErrWrite("", "", type, errorString, "E", logConn);
hrLogWriter.gbfErrWrite(prdCode, empCode, type, errorString, "E", logConn);
//return errString;
continue;
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
}
//Added By Poonam B[02/12/2019][END]
pStmt1.setString(1, prdCode); pStmt1.setString(1, prdCode);
pStmt1.setString(2, empCode); pStmt1.setString(2, empCode);
...@@ -358,15 +409,19 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -358,15 +409,19 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
// Modified on 16/10/2019.Start // Modified on 16/10/2019.Start
if ("PY".equalsIgnoreCase(type)) if ("PY".equalsIgnoreCase(type))
{ {
pstmt3.setString(1, prdCode); // Modified By Poonam B[02/12/2019][To change sequence of setString][START]
pstmt3.setString(2, empCode); /*pstmt3.setString(1, prdCode);
pstmt3.setString(2, empCode);*/
pstmt3.setString(1, empCode);
pstmt3.setString(2, prdCode);
// Modified By Poonam B[02/12/2019][To change sequence of setString][END]
int count2 = pstmt3.executeUpdate(); int count2 = pstmt3.executeUpdate();
pstmt3.clearParameters(); pstmt3.clearParameters();
System.out.println("Payarrtoproc deleted in case of payroll: " +count2); System.out.println("Payarrtoproc deleted in case of payroll: " +count2);
} }
else else
{ {
// Modified on 16/10/2019.End //Modified on 16/10/2019.End
//Modified by Poonam B[18/10/2019][START] //Modified by Poonam B[18/10/2019][START]
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String frDateStr = sdf.format(frDate); String frDateStr = sdf.format(frDate);
...@@ -375,7 +430,11 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -375,7 +430,11 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con); errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con);
return errString; //Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
hrLogWriter.gbfErrWrite(prdCode, empCode, type, errorString, "E", logConn);
//return errString;
continue;
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
} }
//Modified by Poonam B[18/10/2019][END] //Modified by Poonam B[18/10/2019][END]
} }
...@@ -388,7 +447,11 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -388,7 +447,11 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con); errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con);
return errString; //Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
hrLogWriter.gbfErrWrite(prdCode, empCode, type, errorString, "E", logConn);
//return errString;
continue;
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
} }
} }
isSuccess = true; isSuccess = true;
...@@ -417,6 +480,16 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -417,6 +480,16 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
} }
if(rsSelect != null)
{
rsSelect.close();
rsSelect = null;
}
if(pstmtSelect != null)
{
pstmtSelect.close();
pstmtSelect = null;
}
//Added By Poonam B[25-SEP-2019][END] //Added By Poonam B[25-SEP-2019][END]
// Modified on 16/10/2019.Start // Modified on 16/10/2019.Start
...@@ -431,25 +504,38 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -431,25 +504,38 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
con.commit(); con.commit();
//errorString = genericUtility.getErrorString("", "PROCSUCC", userId); //errorString = genericUtility.getErrorString("", "PROCSUCC", userId);
errorString = itmdbAccessEJB.getErrorString("", "PROCSUCC", userId, "", con); errorString = itmdbAccessEJB.getErrorString("", "PROCSUCC", userId, "", con);
hrLogWriter.gbfErrWrite("", "", type, errorString, "I", logConn);//Added by Poonam B[18/10/2019] //Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
//hrLogWriter.gbfErrWrite("", "", type, errorString, "I", logConn);//Added by Poonam B[18/10/2019]
hrLogWriter.gbfErrWrite(prdCode, empCode, type, errorString, "I", logConn);
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
} }
else else
{ {
con.rollback(); con.rollback();
//errorString = genericUtility.getErrorString("", "VPF16DSG01", userId); //errorString = genericUtility.getErrorString("", "VPF16DSG01", userId);
errorString = itmdbAccessEJB.getErrorString("", "VPF16DSG01", userId, "", con); errorString = itmdbAccessEJB.getErrorString("", "VPF16DSG01", userId, "", con);
hrLogWriter.gbfErrWrite("", "", type, errorString, "I", logConn);//Added by Poonam B[18/10/2019] //Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
//hrLogWriter.gbfErrWrite("", "", type, errorString, "I", logConn);//Added by Poonam B[18/10/2019]
hrLogWriter.gbfErrWrite(prdCode, empCode, type, errorString, "E", logConn);
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
} }
//Added by Poonam B[18/10/2019][START] //Added by Poonam B[18/10/2019][START]
if("AR".equalsIgnoreCase(type)) if("AR".equalsIgnoreCase(type))
{ {
lsLogStr = " - Arrears Deletion Process Completed"; lsLogStr = " - Arrears Deletion Process Completed";
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn); //Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
//hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn);
hrLogWriter.gbfErrWrite(prdCode, empCode, type, lsLogStr, "I", logConn);
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
} }
else else
{ {
lsLogStr = " - Payroll Deletion Process Completed"; lsLogStr = " - Payroll Deletion Process Completed";
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn); //Added By Poonam B [03/12/2019][START][To add prdCode and empCode]
//hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn);
hrLogWriter.gbfErrWrite(prdCode, empCode, type, lsLogStr, "I", logConn);
//Added By Poonam B [03/12/2019][END][To add prdCode and empCode]
} }
//Added by Poonam B[18/10/2019][END] //Added by Poonam B[18/10/2019][END]
} }
......
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