Skip to content

B
business-java
Commit 8fe16834 authored by pbhosale's avatar pbhosale
Browse files
Options

updated on[11-12-2019] compared code and add changes done by varsha mam 

AdmCommon.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213382 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 273487b9
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 224 deletions
webitm-adm/src/ibase/webitm/ejb/adm/AdmCommon.java
View file @ 8fe16834
...@@ -36,6 +36,7 @@ import org.w3c.dom.Document; ...@@ -36,6 +36,7 @@ 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;
...@@ -1573,7 +1574,7 @@ public class AdmCommon ...@@ -1573,7 +1574,7 @@ public class AdmCommon
public String chkHRMSiteAccess(String empCode , Date asOfDate , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn) throws ITMException public String chkHRMSiteAccess(String empCode , Date asOfDate , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn) throws ITMException
// modified by Poonam B[02/12/2019][To remove emp_site variable][END] // modified by Poonam B[02/12/2019][To remove emp_site variable][END]
{ {
String status = "",errString=""; String status = "",errString = "";
//modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][START] //modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][START]
//String relieveDateStr = ""; //String relieveDateStr = "";
Timestamp relieveDateTS = null; Timestamp relieveDateTS = null;
...@@ -1617,7 +1618,7 @@ public class AdmCommon ...@@ -1617,7 +1618,7 @@ public class AdmCommon
// modified by Poonam B[02/12/2019][To check when userLevel is -1][START] // modified by Poonam B[02/12/2019][To check when userLevel is -1][START]
//if(userLevel == 0) //if(userLevel == 0)
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);
...@@ -1679,7 +1680,7 @@ public class AdmCommon ...@@ -1679,7 +1680,7 @@ public class AdmCommon
//lsRowSecurity = admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn); //lsRowSecurity = admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn);
lsRowSecurity = checkNull(admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn)); lsRowSecurity = checkNull(admCommon.getEnv("999999" , "HR_SITE_SEC_LEVEL",conn));
if(lsRowSecurity == null || "NULLFOUND".equalsIgnoreCase(lsRowSecurity)) if(lsRowSecurity == null || "NULLFOUND".equalsIgnoreCase(lsRowSecurity))
// modified by Poonam B[02/12/2019][To check when lsRowSecurity is NULLFOUND][END] // modified by Poonam B[02/12/2019][To check when lsRowSecurity is NULLFOUND][END]
{ {
lsRowSecurity = "1"; lsRowSecurity = "1";
} }
...@@ -1701,7 +1702,7 @@ public class AdmCommon ...@@ -1701,7 +1702,7 @@ public class AdmCommon
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 emp_site 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);
...@@ -1754,10 +1755,10 @@ public class AdmCommon ...@@ -1754,10 +1755,10 @@ public class AdmCommon
if(relieveDateTS != null ) if(relieveDateTS != null )
{ {
relieveDate = utilMethods.date(relieveDateTS); relieveDate = utilMethods.date(relieveDateTS);
} }
//modified by Poonam B[02/12/2019][to convert relieveDateTS (Timestamp) to Date format][END] //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);
if((asOfDateStr == null || asOfDateStr.trim().length() == 0)) if((asOfDateStr == null || asOfDateStr.trim().length() == 0))
...@@ -1779,7 +1780,7 @@ public class AdmCommon ...@@ -1779,7 +1780,7 @@ public class AdmCommon
errString = "VMEMP2"; errString = "VMEMP2";
return errString; return errString;
} }
/*if((loginSite != null && loginSite.trim().length() > 0) && !empSite.trim().equalsIgnoreCase(loginSite.trim())) /*if((loginSite != null && loginSite.trim().length() > 0) && !empSite.trim().equalsIgnoreCase(loginSite.trim()))
{ {
System.out.println("INSIDE IF LOOP OF GBFEMP (loginsite) " + loginSite); System.out.println("INSIDE IF LOOP OF GBFEMP (loginsite) " + loginSite);
...@@ -1810,7 +1811,8 @@ public class AdmCommon ...@@ -1810,7 +1811,8 @@ public class AdmCommon
pstmt = null ; pstmt = null ;
} }
} }
catch (SQLException e) { catch (SQLException e)
{
e.printStackTrace(); e.printStackTrace();
} }
} }
...@@ -1833,7 +1835,7 @@ public class AdmCommon ...@@ -1833,7 +1835,7 @@ public class AdmCommon
String sql = "" ; String sql = "" ;
//String status = ""; //String status = "";
//String asOfDateStr = ""; //String asOfDateStr = "";
String siteAccCol = ""; String siteAccCol = "";
String lsRowSecurity = "0"; String lsRowSecurity = "0";
String emp_Code = ""; String emp_Code = "";
...@@ -2022,7 +2024,7 @@ public class AdmCommon ...@@ -2022,7 +2024,7 @@ public class AdmCommon
int revisionNo = 0; int revisionNo = 0;
int retirementAge = 0; int retirementAge = 0;
Timestamp retirementDate = null; Timestamp retirementDate = null;
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);
...@@ -2033,7 +2035,7 @@ public class AdmCommon ...@@ -2033,7 +2035,7 @@ public class AdmCommon
winName = "w_"+winName; winName = "w_"+winName;
} }
System.out.println("winName after if is:::" + winName); System.out.println("winName after if is:::" + winName);
try try
{ {
System.out.println("************ Inside fetchEmpMstInfo Method ******************"); System.out.println("************ Inside fetchEmpMstInfo Method ******************");
...@@ -2065,7 +2067,7 @@ public class AdmCommon ...@@ -2065,7 +2067,7 @@ public class AdmCommon
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
System.out.println("userLevel after change --->" +userLevel); System.out.println("userLevel after change --->" +userLevel);
if(userLevel > 1) if(userLevel > 1)
...@@ -2078,7 +2080,7 @@ public class AdmCommon ...@@ -2078,7 +2080,7 @@ public class AdmCommon
if (rs.next()) if (rs.next())
{ {
siteAccCol = rs.getString("site_acc_col"); siteAccCol = rs.getString("site_acc_col");
System.out.println("siteAccCol ::: "+siteAccCol); System.out.println("siteAccCol::: "+siteAccCol);
} }
if (rs != null) if (rs != null)
{ {
...@@ -2112,9 +2114,9 @@ public class AdmCommon ...@@ -2112,9 +2114,9 @@ public class AdmCommon
} }
} }
sql = "select * from employee where emp_code = ? " + sql = "select * from employee where emp_code = ? " +
" and emp_site = (case when ? = '2' then ? " + " 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)"; " 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 = ? "; //sql = "SELECT * FROM EMPLOYEE WHERE EMP_CODE = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
...@@ -2125,191 +2127,191 @@ public class AdmCommon ...@@ -2125,191 +2127,191 @@ public class AdmCommon
rs= pstmt.executeQuery(); rs= pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
emp_Code = rs.getString("EMP_CODE"); emp_Code = rs.getString("EMP_CODE");
contactCode = rs.getString("CONTACT_CODE"); contactCode = rs.getString("CONTACT_CODE");
empFName = rs.getString("EMP_FNAME"); empFName = rs.getString("EMP_FNAME");
empMName = rs.getString("EMP_MNAME"); empMName = rs.getString("EMP_MNAME");
empLName = rs.getString("EMP_LNAME"); empLName = rs.getString("EMP_LNAME");
namePrefix = rs.getString("NAME_PREFIX"); namePrefix = rs.getString("NAME_PREFIX");
empType = rs.getString("EMP_TYPE"); empType = rs.getString("EMP_TYPE");
designation = rs.getString("DESIGNATION"); designation = rs.getString("DESIGNATION");
deptCode = rs.getString("DEPT_CODE"); deptCode = rs.getString("DEPT_CODE");
grade = rs.getString("GRADE"); grade = rs.getString("GRADE");
cadre = rs.getString("CADRE"); cadre = rs.getString("CADRE");
reportTo = rs.getString("REPORT_TO"); reportTo = rs.getString("REPORT_TO");
curAdd1 = rs.getString("CUR_ADD1"); curAdd1 = rs.getString("CUR_ADD1");
curAdd2 = rs.getString("CUR_ADD2"); curAdd2 = rs.getString("CUR_ADD2");
curAdd3 = rs.getString("CUR_ADD3"); curAdd3 = rs.getString("CUR_ADD3");
curCity = rs.getString("CUR_CITY"); curCity = rs.getString("CUR_CITY");
curState = rs.getString("CUR_STATE"); curState = rs.getString("CUR_STATE");
curPin = rs.getString("CUR_PIN"); curPin = rs.getString("CUR_PIN");
curTel1 = rs.getString("CUR_TEL1"); curTel1 = rs.getString("CUR_TEL1");
curTel2 = rs.getString("CUR_TEL2"); curTel2 = rs.getString("CUR_TEL2");
curTel3 = rs.getString("CUR_TEL3"); curTel3 = rs.getString("CUR_TEL3");
perAdd1 = rs.getString("PER_ADD1"); perAdd1 = rs.getString("PER_ADD1");
perAdd2 = rs.getString("PER_ADD2"); perAdd2 = rs.getString("PER_ADD2");
perAdd3 = rs.getString("PER_ADD3"); perAdd3 = rs.getString("PER_ADD3");
perCity = rs.getString("PER_CITY"); perCity = rs.getString("PER_CITY");
perState = rs.getString("PER_STATE"); perState = rs.getString("PER_STATE");
perPin = rs.getString("PER_PIN"); perPin = rs.getString("PER_PIN");
perTel = rs.getString("PER_TEL"); perTel = rs.getString("PER_TEL");
sex = rs.getString("SEX"); sex = rs.getString("SEX");
nationality = rs.getString("NATIONALITY"); nationality = rs.getString("NATIONALITY");
citizen = rs.getString("CITIZEN"); citizen = rs.getString("CITIZEN");
stateCodeDomicile = rs.getString("STATE_CODE__DOMICILE"); stateCodeDomicile = rs.getString("STATE_CODE__DOMICILE");
mStatus = rs.getString("M_STATUS"); mStatus = rs.getString("M_STATUS");
mStatusDate= rs.getTimestamp("M_STATUS_DATE"); mStatusDate= rs.getTimestamp("M_STATUS_DATE");
birthDate = rs.getTimestamp("BIRTH_DATE"); birthDate = rs.getTimestamp("BIRTH_DATE");
bloodGrp = rs.getString("BLOOD_GRP"); bloodGrp = rs.getString("BLOOD_GRP");
contactPers = rs.getString("CONTACT_PERS"); contactPers = rs.getString("CONTACT_PERS");
religion = rs.getString("RELIGION"); religion = rs.getString("RELIGION");
joinedAs = rs.getString("JOINED_AS"); joinedAs = rs.getString("JOINED_AS");
dateJoin = rs.getTimestamp("DATE_JOIN"); dateJoin = rs.getTimestamp("DATE_JOIN");
modeApp = rs.getString("MODE_APP"); modeApp = rs.getString("MODE_APP");
workShift = rs.getString("WORK_SHIFT"); workShift = rs.getString("WORK_SHIFT");
shiftRot = rs.getString("SHIFT_ROT"); shiftRot = rs.getString("SHIFT_ROT");
holTblNo = rs.getString("HOL_TBLNO"); holTblNo = rs.getString("HOL_TBLNO");
payType = rs.getString("PAY_TYPE"); payType = rs.getString("PAY_TYPE");
payMode = rs.getString("PAY_MODE"); payMode = rs.getString("PAY_MODE");
emp_Site = rs.getString("EMP_SITE"); emp_Site = rs.getString("EMP_SITE");
paySite = rs.getString("PAY_SITE"); paySite = rs.getString("PAY_SITE");
workSite = rs.getString("WORK_SITE"); workSite = rs.getString("WORK_SITE");
bankCode = rs.getString("BANK_CODE"); bankCode = rs.getString("BANK_CODE");
bankAcct = rs.getString("BANK_ACCT"); bankAcct = rs.getString("BANK_ACCT");
stanCode = rs.getString("STAN_CODE"); stanCode = rs.getString("STAN_CODE");
ddPayableBank = rs.getString("DD_PAYABLE_BANK"); ddPayableBank = rs.getString("DD_PAYABLE_BANK");
totExp = rs.getInt("TOT_EXP"); totExp = rs.getInt("TOT_EXP");
pfNo = rs.getString("PF_NO"); pfNo = rs.getString("PF_NO");
fpfNo = rs.getString("FPF_NO"); fpfNo = rs.getString("FPF_NO");
esicNo = rs.getString("ESIC_NO"); esicNo = rs.getString("ESIC_NO");
itNo = rs.getString("IT_NO"); itNo = rs.getString("IT_NO");
basic = rs.getInt("BASIC"); basic = rs.getInt("BASIC");
gross = rs.getInt("GROSS"); gross = rs.getInt("GROSS");
hobby1 = rs.getString("HOBBY1"); hobby1 = rs.getString("HOBBY1");
hobby2 = rs.getString("HOBBY2"); hobby2 = rs.getString("HOBBY2");
hobby3 = rs.getString("HOBBY3"); hobby3 = rs.getString("HOBBY3");
hobby4 = rs.getString("HOBBY4"); hobby4 = rs.getString("HOBBY4");
otherInfo = rs.getString("OTHER_INFO"); otherInfo = rs.getString("OTHER_INFO");
projCode = rs.getString("PROJ_CODE"); projCode = rs.getString("PROJ_CODE");
deputeNo = rs.getString("DEPUTE_NO"); deputeNo = rs.getString("DEPUTE_NO");
rating = rs.getString("RATING"); rating = rs.getString("RATING");
trainingPrd = rs.getInt("TRAINING_PRD"); trainingPrd = rs.getInt("TRAINING_PRD");
probationDate = rs.getTimestamp("PROBATION_DATE"); probationDate = rs.getTimestamp("PROBATION_DATE");
probationPrd = rs.getInt("PROBATION_PRD"); probationPrd = rs.getInt("PROBATION_PRD");
probation = rs.getString("PROBATION"); probation = rs.getString("PROBATION");
dateConf = rs.getTimestamp("DATE_CONF"); dateConf = rs.getTimestamp("DATE_CONF");
confirmed = rs.getString("CONFIRMED"); confirmed = rs.getString("CONFIRMED");
noticePrd = rs.getInt("NOTICE_PRD"); noticePrd = rs.getInt("NOTICE_PRD");
residate = rs.getTimestamp("RESI_DATE"); residate = rs.getTimestamp("RESI_DATE");
relieve_Date = rs.getTimestamp("RELIEVE_DATE"); relieve_Date = rs.getTimestamp("RELIEVE_DATE");
empCodeLink = rs.getString("EMP_CODE__LINK"); empCodeLink = rs.getString("EMP_CODE__LINK");
acctCodeSal = rs.getString("ACCT_CODE__SAL"); acctCodeSal = rs.getString("ACCT_CODE__SAL");
cctrCodeSal = rs.getString("CCTR_CODE__SAL"); cctrCodeSal = rs.getString("CCTR_CODE__SAL");
alterCode = rs.getString("ALTER_CODE"); alterCode = rs.getString("ALTER_CODE");
withHeld = rs.getString("WITH_HELD"); withHeld = rs.getString("WITH_HELD");
apprNoLast = rs.getString("APPR_NO__LAST"); apprNoLast = rs.getString("APPR_NO__LAST");
statusEmp = rs.getString("STATUS"); statusEmp = rs.getString("STATUS");
chgDate = rs.getTimestamp("CHG_DATE"); chgDate = rs.getTimestamp("CHG_DATE");
chgUser = rs.getString("CHG_USER"); chgUser = rs.getString("CHG_USER");
chgTerm = rs.getString("CHG_TERM"); chgTerm = rs.getString("CHG_TERM");
shortName = rs.getString("SHORT_NAME"); shortName = rs.getString("SHORT_NAME");
stanCodeHq = rs.getString("STAN_CODE__HQ"); stanCodeHq = rs.getString("STAN_CODE__HQ");
procGroup = rs.getString("PROC_GROUP"); procGroup = rs.getString("PROC_GROUP");
contactAdd1 = rs.getString("CONTACT_ADD1"); contactAdd1 = rs.getString("CONTACT_ADD1");
contactAdd2 = rs.getString("CONTACT_ADD2"); contactAdd2 = rs.getString("CONTACT_ADD2");
contactAdd3 = rs.getString("CONTACT_ADD3"); contactAdd3 = rs.getString("CONTACT_ADD3");
contactCity = rs.getString("CONTACT_CITY"); contactCity = rs.getString("CONTACT_CITY");
contactState = rs.getString("CONTACT_STATE"); contactState = rs.getString("CONTACT_STATE");
contactPin = rs.getString("CONTACT_PIN"); contactPin = rs.getString("CONTACT_PIN");
contactTel = rs.getString("CONTACT_TEL"); contactTel = rs.getString("CONTACT_TEL");
noticePeriod = rs.getInt("NOTICE_PERIOD"); noticePeriod = rs.getInt("NOTICE_PERIOD");
designCode = rs.getString("DESIGN_CODE"); designCode = rs.getString("DESIGN_CODE");
siteCodePayment = rs.getString("SITE_CODE__PAYMENT"); siteCodePayment = rs.getString("SITE_CODE__PAYMENT");
siteCodeIBCA = rs.getString("SITE_CODE__IBCA"); siteCodeIBCA = rs.getString("SITE_CODE__IBCA");
mobileNo = rs.getString("MOBILE_NO"); mobileNo = rs.getString("MOBILE_NO");
smsDomain = rs.getString("SMS_DOMAIN"); smsDomain = rs.getString("SMS_DOMAIN");
emailIDoff = rs.getString("EMAIL_ID_OFF"); emailIDoff = rs.getString("EMAIL_ID_OFF");
emailIDPer = rs.getString("EMAIL_ID_PER"); emailIDPer = rs.getString("EMAIL_ID_PER");
reportToAdmin = rs.getString("REPORT_TO__ADMIN"); reportToAdmin = rs.getString("REPORT_TO__ADMIN");
funcGroup = rs.getString("FUNC_GROUP"); funcGroup = rs.getString("FUNC_GROUP");
esiDispensary = rs.getString("ESI_DISPENSARY"); esiDispensary = rs.getString("ESI_DISPENSARY");
autoAdv = rs.getString("AUTO_ADV"); autoAdv = rs.getString("AUTO_ADV");
incrDate = rs.getTimestamp("INCR_DATE"); incrDate = rs.getTimestamp("INCR_DATE");
normalRate = rs.getInt("NORMAL_RATE"); normalRate = rs.getInt("NORMAL_RATE");
otRate = rs.getInt("OT_RATE"); otRate = rs.getInt("OT_RATE");
maidenName = rs.getString("MAIDEN_NAME"); maidenName = rs.getString("MAIDEN_NAME");
birthPlace = rs.getString("BIRTH_PLACE"); birthPlace = rs.getString("BIRTH_PLACE");
resiPermitNo = rs.getString("RESI_PERMIT_NO"); resiPermitNo = rs.getString("RESI_PERMIT_NO");
resiPermitUpto = rs.getTimestamp("RESI_PERMIT_UPTO"); resiPermitUpto = rs.getTimestamp("RESI_PERMIT_UPTO");
socialSecNo = rs.getString("SOCIAL_SECURITY_NO"); socialSecNo = rs.getString("SOCIAL_SECURITY_NO");
patternCode = rs.getString("PATTERN_CODE"); patternCode = rs.getString("PATTERN_CODE");
gratuityDate = rs.getTimestamp("GRATUITY_DATE"); gratuityDate = rs.getTimestamp("GRATUITY_DATE");
periodCode = rs.getString("PERIOD_CODE"); periodCode = rs.getString("PERIOD_CODE");
eligibleOt = rs.getString("ELIGIBLE_OT"); eligibleOt = rs.getString("ELIGIBLE_OT");
standbyMode = rs.getString("STANDBY_MODE"); standbyMode = rs.getString("STANDBY_MODE");
workTblNo = rs.getString("WORK_TBLNO"); workTblNo = rs.getString("WORK_TBLNO");
suppCodeCon = rs.getString("SUPP_CODE__CON"); suppCodeCon = rs.getString("SUPP_CODE__CON");
shiftIndex = rs.getInt("SHIFT_INDEX"); shiftIndex = rs.getInt("SHIFT_INDEX");
occupCode = rs.getString("OCCUPATION_CODE"); occupCode = rs.getString("OCCUPATION_CODE");
empClass = rs.getString("EMP_CLASS"); empClass = rs.getString("EMP_CLASS");
imeNo = rs.getString("IME_NO"); imeNo = rs.getString("IME_NO");
pensionScheme = rs.getString("PENSION_SCHEME"); pensionScheme = rs.getString("PENSION_SCHEME");
posCode = rs.getString("POS_CODE"); posCode = rs.getString("POS_CODE");
workCtr = rs.getString("WORK_CTR"); workCtr = rs.getString("WORK_CTR");
bondPrd = rs.getInt("BOND_PRD"); bondPrd = rs.getInt("BOND_PRD");
BondAmt = rs.getInt("BOND_AMT"); BondAmt = rs.getInt("BOND_AMT");
empCodeHod = rs.getString("EMP_CODE__HOD"); empCodeHod = rs.getString("EMP_CODE__HOD");
passportNo = rs.getString("PASSPORT_NO"); passportNo = rs.getString("PASSPORT_NO");
dateOfIssue = rs.getTimestamp("DATE_OF_ISSUE"); dateOfIssue = rs.getTimestamp("DATE_OF_ISSUE");
placeOfIssue = rs.getString("PLACE_OF_ISSUE"); placeOfIssue = rs.getString("PLACE_OF_ISSUE");
validUpto = rs.getTimestamp("VALID_UPTO"); validUpto = rs.getTimestamp("VALID_UPTO");
addr1Pass = rs.getString("ADDR1__PASS"); addr1Pass = rs.getString("ADDR1__PASS");
addr2Pass = rs.getString("ADDR2__PASS"); addr2Pass = rs.getString("ADDR2__PASS");
addr3Pass = rs.getString("ADDR3__PASS"); addr3Pass = rs.getString("ADDR3__PASS");
cityPass = rs.getString("CITY__PASS"); cityPass = rs.getString("CITY__PASS");
stateCodePass = rs.getString("STATE_CODE__PASS"); stateCodePass = rs.getString("STATE_CODE__PASS");
pinPass = rs.getString("PIN__PASS"); pinPass = rs.getString("PIN__PASS");
uanNo = rs.getString("UAN_NO"); uanNo = rs.getString("UAN_NO");
insiderTradingOpt = rs.getString("INSIDER_TRADING_OPT"); insiderTradingOpt = rs.getString("INSIDER_TRADING_OPT");
user_Id = rs.getString("USER_ID"); user_Id = rs.getString("USER_ID");
workLocCode = rs.getString("WORK_LOC_CODE"); workLocCode = rs.getString("WORK_LOC_CODE");
parentDept = rs.getString("PARENT_DEPT"); parentDept = rs.getString("PARENT_DEPT");
extNo = rs.getString("EXT_NO"); extNo = rs.getString("EXT_NO");
adharCardNo = rs.getString("AADHAR_CARD_NO"); adharCardNo = rs.getString("AADHAR_CARD_NO");
electionNo = rs.getString("ELECTION_CARD_NO"); electionNo = rs.getString("ELECTION_CARD_NO");
drivLicNo = rs.getString("DRIV_LIC_NO"); drivLicNo = rs.getString("DRIV_LIC_NO");
drivLicUpto = rs.getTimestamp("DRIV_LIC_VALID_UPTO"); drivLicUpto = rs.getTimestamp("DRIV_LIC_VALID_UPTO");
physicalHandicap = rs.getString("PHYSICAL_HANDICAP"); physicalHandicap = rs.getString("PHYSICAL_HANDICAP");
handicapCategory = rs.getString("HANDICAP_CATEGORY"); handicapCategory = rs.getString("HANDICAP_CATEGORY");
pfUan = rs.getString("PF_UAN"); pfUan = rs.getString("PF_UAN");
grpMediclaim = rs.getString("GROUP_MEDICLAIM"); grpMediclaim = rs.getString("GROUP_MEDICLAIM");
pensionEligible = rs.getString("PENSION_ELIGIBLE"); pensionEligible = rs.getString("PENSION_ELIGIBLE");
IFSC = rs.getString("IFSC"); IFSC = rs.getString("IFSC");
buCode = rs.getString("BU_CODE"); buCode = rs.getString("BU_CODE");
bondAmtReco = rs.getInt("BOND_AMT__RECO"); bondAmtReco = rs.getInt("BOND_AMT__RECO");
contactId = rs.getString("CONTACT_ID"); contactId = rs.getString("CONTACT_ID");
empCodeAprv = rs.getString("EMP_CODE__APRV"); empCodeAprv = rs.getString("EMP_CODE__APRV");
confDate = rs.getTimestamp("CONF_DATE"); confDate = rs.getTimestamp("CONF_DATE");
uuid = rs.getString("UUID"); uuid = rs.getString("UUID");
empCodeFunchead = rs.getString("EMP_CODE__FUNCHEAD"); empCodeFunchead = rs.getString("EMP_CODE__FUNCHEAD");
motherTongue = rs.getString("MOTHER_TONGUE"); motherTongue = rs.getString("MOTHER_TONGUE");
castCategory = rs.getString("CAST_CATEGORY"); castCategory = rs.getString("CAST_CATEGORY");
countCodeBirth = rs.getString("COUNT_CODE__BIRTH"); countCodeBirth = rs.getString("COUNT_CODE__BIRTH");
jobTitle = rs.getString("JOB_TITLE"); jobTitle = rs.getString("JOB_TITLE");
empIdexternal = rs.getString("EMP_ID_EXTERNAL"); empIdexternal = rs.getString("EMP_ID_EXTERNAL");
empFnameLong = rs.getString("EMP_FNAME_LONG"); empFnameLong = rs.getString("EMP_FNAME_LONG");
empMnameLong = rs.getString("EMP_MNAME_LONG"); empMnameLong = rs.getString("EMP_MNAME_LONG");
empLnameLong = rs.getString("EMP_LNAME_LONG"); empLnameLong = rs.getString("EMP_LNAME_LONG");
zoneCode = rs.getString("ZONECODE"); zoneCode = rs.getString("ZONECODE");
teamCode = rs.getString("TEAMCODE"); teamCode = rs.getString("TEAMCODE");
designationID = rs.getInt("DESIGNATIONID"); designationID = rs.getInt("DESIGNATIONID");
regionID = rs.getInt("REGIONID"); regionID = rs.getInt("REGIONID");
hqid = rs.getString("HQID"); hqid = rs.getString("HQID");
shName = rs.getString("SH_NAME"); shName = rs.getString("SH_NAME");
currGeoPos = rs.getString("CURR_GEO_POS"); currGeoPos = rs.getString("CURR_GEO_POS");
perGeoPos = rs.getString("PER_GEO_POS"); perGeoPos = rs.getString("PER_GEO_POS");
revisionNo = rs.getInt("REVISION_NO"); revisionNo = rs.getInt("REVISION_NO");
retirementAge = rs.getInt("RETIREMENT_AGE"); retirementAge = rs.getInt("RETIREMENT_AGE");
retirementDate = rs.getTimestamp("RETIREMENT_DATE"); retirementDate = rs.getTimestamp("RETIREMENT_DATE");
...@@ -2503,7 +2505,7 @@ public class AdmCommon ...@@ -2503,7 +2505,7 @@ public class AdmCommon
else else
{ {
//fetchEmpMap = null; //fetchEmpMap = null;
fetchEmpMap.put("EMP_CODE" , checkNull(emp_Code)); fetchEmpMap.put("EMP_CODE" , checkNull(emp_Code));
fetchEmpMap.put("CONTACT_CODE" , checkNull(contactCode)); fetchEmpMap.put("CONTACT_CODE" , checkNull(contactCode));
fetchEmpMap.put("EMP_FNAME" , checkNull(empFName)); fetchEmpMap.put("EMP_FNAME" , checkNull(empFName));
...@@ -2690,7 +2692,7 @@ public class AdmCommon ...@@ -2690,7 +2692,7 @@ public class AdmCommon
fetchEmpMap.put("REVISION_NO" , revisionNo); fetchEmpMap.put("REVISION_NO" , revisionNo);
fetchEmpMap.put("RETIREMENT_AGE" , retirementAge); fetchEmpMap.put("RETIREMENT_AGE" , retirementAge);
fetchEmpMap.put("RETIREMENT_DATE" , retirementDate); fetchEmpMap.put("RETIREMENT_DATE" , retirementDate);
} }
if(rs != null) if(rs != null)
{ {
...@@ -2703,7 +2705,7 @@ public class AdmCommon ...@@ -2703,7 +2705,7 @@ public class AdmCommon
pstmt.close(); pstmt.close();
pstmt = null ; pstmt = null ;
} }
System.out.println("fetchEmpMap:::::" +fetchEmpMap); System.out.println("fetchEmpMap:::::" +fetchEmpMap);
} }
catch(Exception e) catch(Exception e)
...@@ -2731,7 +2733,7 @@ public class AdmCommon ...@@ -2731,7 +2733,7 @@ public class AdmCommon
e.printStackTrace(); e.printStackTrace();
} }
} }
System.out.println("Final HashMap fetchEmpMap from fetchEmpMstInfo :::::" +fetchEmpMap); System.out.println("Final HashMap fetchEmpMap from fetchEmpMst Info:::::" +fetchEmpMap);
return fetchEmpMap; return fetchEmpMap;
} }
//Added by Poonam B[02/12/2019][END][method to get employee information] //Added by Poonam B[02/12/2019][END][method to get employee information]
...@@ -6280,10 +6282,10 @@ public class AdmCommon ...@@ -6280,10 +6282,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] // 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] // Modified by Poonam B[27/11/2019][END][To avoid Casting error]
pstmt.setDouble(counter, data); pstmt.setDouble(counter, data);
} }
...@@ -6326,7 +6328,7 @@ public class AdmCommon ...@@ -6326,7 +6328,7 @@ public class AdmCommon
} }
else else
{ {
//Added By Poonam B[18/11/2019][END] //Added By Poonam B[19/11/2019][END]
if(inputType.contains("String")) if(inputType.contains("String"))
{ {
pstmt.setString(counter, obj.toString()); pstmt.setString(counter, obj.toString());
...@@ -6406,6 +6408,7 @@ public class AdmCommon ...@@ -6406,6 +6408,7 @@ public class AdmCommon
//Modified By Poonam B[18/11/2019][START] //Modified By Poonam B[18/11/2019][START]
//throw new ITMException(e); //throw new ITMException(e);
errorCode = "CONFIGUREERR\t"+e.getMessage(); errorCode = "CONFIGUREERR\t"+e.getMessage();
returnMap.put("errorcode", errorCode); returnMap.put("errorcode", errorCode);
returnMap.put("value", 0.0d); returnMap.put("value", 0.0d);
//Modified By Poonam B[18/11/2019][END] //Modified By Poonam B[18/11/2019][END]
...@@ -6712,25 +6715,19 @@ public class AdmCommon ...@@ -6712,25 +6715,19 @@ public class AdmCommon
mminamt = rs.getDouble("min_amt"); mminamt = rs.getDouble("min_amt");
mmaxamt = rs.getDouble("max_amt"); mmaxamt = rs.getDouble("max_amt");
applyamt = baseamt; applyamt = baseamt;
System.out.println("mminbamt :: ["+mminbamt+"] mmaxbamt :: ["+mmaxbamt+"] mamount :: ["+mamount+"]" System.out.println("mminbamt :: ["+mminbamt+"] mmaxbamt :: ["+mmaxbamt+"] mamount :: ["+mamount+"]"
+" type :: ["+type+"] mminamt :: ["+mminamt+"] mmaxamt :: ["+mmaxamt+"]"); +" type :: ["+type+"] mminamt :: ["+mminamt+"] mmaxamt :: ["+mmaxamt+"]");
if(slabopt.equalsIgnoreCase("D")) if(slabopt.equalsIgnoreCase("D"))
{
if(slabamt >= mminbamt && slabamt <= mmaxbamt)
{ {
if(slabamt >= mminbamt && slabamt <= mmaxbamt) if("P".equalsIgnoreCase(type))
{ {
if("P".equalsIgnoreCase(type)) retval = applyamt * mamount / 100;
{ }
retval = applyamt * mamount / 100; else
} {
else retval = mamount;
{
retval = mamount;
}
if(mminamt > 0 && retval < mminamt)
retval = mminamt;
if(mmaxamt > 0 && retval > mmaxamt)
retval = mmaxamt;
break;
} }
} }
else else
...@@ -6763,17 +6760,18 @@ public class AdmCommon ...@@ -6763,17 +6760,18 @@ public class AdmCommon
{ {
break; break;
} }
}
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
} }
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
} }
} }
catch(Exception e) catch(Exception e)
...@@ -6815,4 +6813,52 @@ public class AdmCommon ...@@ -6815,4 +6813,52 @@ 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
} }
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