Skip to content

B
business-java
Commit ae5cb6ea authored by rtelang's avatar rtelang
Browse files
Options

EmployeeServicePrdAmdConf.java 

EmployeeServicePrdAmdIC.java
-1. If already unconfirmed entry exist for entered employee code then system should show an error message.
2. If user level greater than 1 then system should check entry in user site master against employee pay site and login code.If the user has no rights to access the site then system should not allow the add transaction.
3. Entry should be display respective login site wise. Currently it is displaying for all sites.
4. For Protect retirement date variable, if we set as 'Y'  then retirement date new field should get disabled. If we set as 'N' then  retirement date new field should get enabled.
5..On Edit,System should Enable/Disable retirement date new on the basis of PROTECT_RETIRE_DATE variable value Y/N(Y for Disable and N for Enable).
A18LSUN006.sql
-Added system entry in obj_itmchange.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@202172 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 04d14d8d
Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 40 deletions
webitm-adm/ibase/webitm/ejb/adm/EmployeeServicePrdAmdIC.java
View file @ ae5cb6ea
......@@ -38,21 +38,21 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
{
if(xmlString != null && xmlString.trim().length() > 0)
{
System.out.println("xmlString::::::::"+xmlString);
//System.out.println("xmlString::::::::"+xmlString);
dom = genericUtility.parseString(xmlString);
System.out.println("dom:::::::::"+dom);
//System.out.println("dom:::::::::"+dom);
}
if(xmlString1 != null && xmlString1.trim().length() > 0)
{
System.out.println("xmlString1::::::::"+xmlString1);
//System.out.println("xmlString1::::::::"+xmlString1);
dom1 = genericUtility.parseString(xmlString1);
System.out.println("dom1:::::::::"+dom1);
//System.out.println("dom1:::::::::"+dom1);
}
if(xmlString2 != null && xmlString2.trim().length() > 0)
{
System.out.println("xmlString2::::::::"+xmlString2);
//System.out.println("xmlString2::::::::"+xmlString2);
dom2 = genericUtility.parseString(xmlString2);
System.out.println("dom2:::::::::"+dom2);
//System.out.println("dom2:::::::::"+dom2);
}
retString = wfValData(dom,dom1,dom2,objContext,editFlag,xtraParams);
System.out.println("retString of EmployeeServicePrdAmdIC -->wfValData:::"+retString);
......@@ -73,6 +73,7 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
ResultSet rs = null;
String sql = "";
String errString = "",userId = "",loginCode = "",msgType = "",periodAmended = "",retirementDateOld = "";
String siteCode = "";//Modified by Rohini T. on [14/06/2019]
Timestamp relDate = null;
int currentFormNo = 0,childNodeLength = 0,ctr = 0,cnt = 0,periodAmd = 0;
Node parentNode = null,childNode = null;
......@@ -123,18 +124,91 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
}
else
{
//Modified by Rohini R. on [14/06/2019][Start]
//sql = "select count(*) as count ,STATUS ,relieve_date from employee where emp_code = ? GROUP BY STATUS,relieve_date";
sql = "select status ,relieve_date,pay_site from employee where emp_code = ?";
//Modified by Rohini R. on [14/06/2019][End]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
//Modified by Rohini R. on [14/06/2019][Start]
//cnt = rs.getInt("count");
cnt = 1;
siteCode = checkNull(rs.getString("pay_site"));
//Modified by Rohini R. on [14/06/2019][End]
status = checkNull(rs.getString("status"));
relDate = rs.getTimestamp("relieve_date");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt == 0)
{
errCode = "VTEMPSPA01";//Entered employee code does not existing in master, please enter correct employee code
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, errCode);
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
//Modified by Rohini R. on [12/06/2019][Start]
if("A".equalsIgnoreCase(editFlag))
{
//Modified by Rohini R. on [14/06/2019][Start]
String userLevel = "";
int usrLvl = 0;
int count = 0;
sql = "SELECT USR_LEV FROM USERS WHERE CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, loginCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
userLevel = checkNull( rs.getString( "USR_LEV" ) );
}
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
try
{
usrLvl = Integer.parseInt( userLevel ) ;
}
catch(Exception e)
{
System.out.println("exception while parsing---["+e.getMessage()+"]");
usrLvl = 1;
}
if( usrLvl > 1 )
{
int count = 0;
sql = "select count(*) as unconfirmed_record from EMP_SERVICEPRD_AMD where emp_code = ? and confirmed <> 'Y'";
sql = "select count(*) as cnt from user_site where USER_ID = ? and site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(1, loginCode);
pstmt.setString(2, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
count = rs.getInt("cnt");
}
if(rs != null)
{
......@@ -146,22 +220,25 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
pstmt.close();
pstmt = null;
}
if(count > 0)
if(count <= 0)
{
errString = itmdbAccessEJB.getErrorString("", "VTEMPSPA15", "", "", conn);//Already Unconfirmed entry exists for employee.
errString = itmdbAccessEJB.getErrorString("", "VTEMPSPA17", "", "", conn);//You are not allow to access this site.
return errString;
}
}
//Modified by Rohini R. on [12/06/2019][End]
sql = "select count(*) as count ,STATUS ,relieve_date from employee where emp_code = ? GROUP BY STATUS,relieve_date";
//Modified by Rohini R. on [14/06/2019][End]
count = 0;
//sql = "select count(*) as unconfirmed_record from EMP_SERVICEPRD_AMD where emp_code = ? and confirmed <> 'Y'";
sql = "SELECT COUNT(*) FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND(CASE WHEN CONFIRMED IS NULL THEN 'N' ELSE CONFIRMED END <> 'Y' AND CASE WHEN canceled IS NULL THEN 'N' ELSE canceled END = 'N')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt("count");
status = checkNull(rs.getString("status"));
relDate = rs.getTimestamp("RELIEVE_DATE");
count = rs.getInt(1);
}
if(rs != null)
{
......@@ -173,17 +250,13 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
pstmt.close();
pstmt = null;
}
if(cnt == 0)
if(count > 0)
{
errCode = "VTEMPSPA01";//Entered employee code does not existing in master, please enter correct employee code
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, errCode);
if (msgType.equalsIgnoreCase("E"))
{
break;
errString = itmdbAccessEJB.getErrorString("", "VTEMPSPA15", "", "", conn);//Already Unconfirmed entry exists for employee.
return errString;
}
}
//Modified by Rohini R. on [12/06/2019][End]
if("S".equalsIgnoreCase(status))
{
errCode = "VTEMPSPA02";//Employee is separated from organization.
......@@ -208,7 +281,7 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
}
}
}
if("period_amended".equalsIgnoreCase(childNodeName))
else if("period_amended".equalsIgnoreCase(childNodeName))
{
periodAmended = checkNull(genericUtility.getColumnValue("period_amended", dom));
System.out.println("periodAmended--["+periodAmended+"]");
......@@ -225,7 +298,7 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
}
}
//Modified by Rohini R. on [12/06/2019][End]
System.out.println("");
//System.out.println("");
try
{
periodAmd = (periodAmended != null && periodAmended.trim().length() > 0 ) ?Integer.parseInt(periodAmended):0;
......@@ -250,6 +323,8 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
}
}
//Modified by Rohini R. on [14/06/2019][Start]
/*
if("retirement_date_o".equalsIgnoreCase(childNodeName))
{
retirementDateOld = checkNull(genericUtility.getColumnValue("retirement_date_o", dom));
......@@ -264,8 +339,9 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
break;
}
}
}
if("retirement_age_n".equalsIgnoreCase(childNodeName))
}*/
//Modified by Rohini R. on [14/06/2019][End]
else if("retirement_age_n".equalsIgnoreCase(childNodeName))
{
retirementAgeNew = checkNull(genericUtility.getColumnValue("retirement_age_n", dom));
if(retirementAgeNew == null || retirementAgeNew.trim().length() == 0)
......@@ -280,7 +356,7 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
}
}
}
if("retirement_date_n".equalsIgnoreCase(childNodeName))
else if("retirement_date_n".equalsIgnoreCase(childNodeName))
{
retirementDateNew = checkNull(genericUtility.getColumnValue("retirement_date_n", dom));
if(retirementDateNew == null || retirementDateNew.trim().length() == 0)
......@@ -384,9 +460,9 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
String errFields = null;
try
{
System.out.println("xmlString [" + xmlString + "]");
/*System.out.println("xmlString [" + xmlString + "]");
System.out.println("xmlString1 [" + xmlString1 + "]");
System.out.println("xmlString2 [" + xmlString2 + "]");
System.out.println("xmlString2 [" + xmlString2 + "]");*/
if (xmlString != null && xmlString.trim().length() != 0)
{
dom = genericUtility.parseString(xmlString);
......@@ -438,6 +514,8 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
String cadreCode = "";
String gradeCode = "";
//Modified by Rohini T on[15/05/19][end]
String tranId = "";
String brthDate = "";
try
{
conn = getConnection();
......@@ -486,15 +564,90 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
//valueXmlString.append("<period_amended><![CDATA[").append(1).append("]]></period_amended>\r\n");
valueXmlString.append("<period_amended><![CDATA[").append(0).append("]]></period_amended>\r\n");
//Modified by Rohini T on[15/05/19][end]
//Modified by Rohini T on[17/06/19][start]
empCode = genericUtility.getColumnValue("emp_code", dom);
if(empCode != null && empCode.trim().length() > 0)
{
StringBuffer retStr = new StringBuffer();
valueXmlString.append("<emp_code><![CDATA[").append(empCode).append("]]></emp_code>\r\n");
retStr.append(valueXmlString);
retStr.append("</Detail1>\r\n");
retStr.append("</Root>");
System.out.println("retStr--["+retStr+"]");
String retString = itemChanged(retStr.toString(), "", retStr.toString(), objContext, "emp_code", editFlag, xtraParams);
System.out.println("retString::::"+retString);
retString = retString.substring(retString.indexOf("<Detail1>")+1, retString.indexOf("</Detail1>"));
System.out.println("retString after manipulation---["+retString+"]");
valueXmlString.append(retString);
System.out.println("valueXmlString from itm_default --["+valueXmlString+"]");
}
//Modified by Rohini T on[17/06/19][End]
}
//Modified by Rohini T on[17/06/19][Start]
if(currentColumn.equalsIgnoreCase("itm_defaultedit"))
{
System.out.println("Inside itm_defaultedit itemchange:::::");
empCode = genericUtility.getColumnValue("emp_code", dom);
sql = "SELECT PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCode = checkNull(rs.getString("PAY_SITE"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
retdateN = checkNull(genericUtility.getColumnValue("retirement_date_n", dom));
retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn));
}
if("Y".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date_n protect='1'>").append("<![CDATA[" + retdateN + "]]>").append("</retirement_date_n>\r\n");
}
else
{
valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + retdateN + "]]>").append("</retirement_date_n>\r\n");
}
}
//Modified by Rohini T on[17/06/19][End]
else if(currentColumn.trim().equalsIgnoreCase("emp_code"))
{
System.out.println("Inside emp_code itemchange:::::");
empCode = genericUtility.getColumnValue("emp_code", dom);
sql = "select retirement_age,retirement_date,birth_date,case when emp_fname_long is null then emp_fname else emp_fname_long end as emp_fname_long,"
tranId = genericUtility.getColumnValue("tran_id", dom);
//System.out.println("tranId:::"+tranId);
//Modified by Rohini T on[17/06/19][START]
if(tranId == null || tranId.trim().length() == 0)
{
tranId = "*";
}
//Modified by Rohini T on[17/06/19][END]
//Modified by Rohini T on[14/06/19][start]
/*sql = "select retirement_age,retirement_date,birth_date,case when emp_fname_long is null then emp_fname else emp_fname_long end as emp_fname_long,"
+" case when emp_mname_long is null then emp_mname else emp_mname_long end as emp_mname_long,"
+" case when emp_lname_long is null then emp_lname else emp_lname_long end as emp_lname_long"
+" FROM employee WHERE EMP_CODE = ?";*/
sql = "select retirement_age,retirement_date,birth_date,pay_site, CADRE, GRADE,case when emp_fname_long is null then emp_fname else emp_fname_long end as emp_fname_long,"
+" case when emp_mname_long is null then emp_mname else emp_mname_long end as emp_mname_long,"
+" case when emp_lname_long is null then emp_lname else emp_lname_long end as emp_lname_long"
+" FROM employee WHERE EMP_CODE = ?";
//Modified by Rohini T on[14/06/19][End]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
rs = pstmt.executeQuery();
......@@ -506,6 +659,11 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
fName = checkNull(rs.getString("emp_fname_long"));
mName = checkNull(rs.getString("emp_mname_long"));
lName = checkNull(rs.getString("emp_lname_long"));
//Modified by Rohini T on[14/06/19][start]
siteCode = checkNull(rs.getString("pay_site"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
//Modified by Rohini T on[14/06/19][End]
}
if(rs != null)
{
......@@ -526,9 +684,15 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
{
birthDt = getCurrdateAppFormat(birthDate);
}
sql = "SELECT MAX(AMENDMENT_NO) FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ?";
//Modified by Rohini T on[14/06/19][start]
valueXmlString.append("<pay_site>").append("<![CDATA[" + siteCode + "]]>").append("</pay_site>\r\n");
sql = "SELECT MAX(AMENDMENT_NO) FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND TRAN_ID <> ?";
//Modified by Rohini T on[14/06/19][End]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -545,7 +709,9 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
pstmt.close();
pstmt = null;
}
//System.out.println("amdNo-BEFORE-["+amdNo+"]");
amdNo = amdNo + 1;
//System.out.println("amdNo-AFTER-["+amdNo+"]");
if(retDateOld != null)
{
valueXmlString.append("<retirement_date_o protect='1'>").append("<![CDATA[" + retdateO + "]]>").append("</retirement_date_o>\r\n");
......@@ -561,9 +727,28 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
valueXmlString.append("<emp_fname_long><![CDATA[").append(fName).append("]]></emp_fname_long>\r\n");
valueXmlString.append("<emp_mname_long><![CDATA[").append(mName).append("]]></emp_mname_long>\r\n");
valueXmlString.append("<emp_lname_long><![CDATA[").append(lName).append("]]></emp_lname_long>\r\n");
//System.out.println("amdNo--WHILE APPENDING["+amdNo+"]");
valueXmlString.append("<amendment_no><![CDATA[").append(amdNo).append("]]></amendment_no>\r\n");
//Modified by Rohini T on[14/06/19][start]
retdateN = checkNull(genericUtility.getColumnValue("retirement_date_n", dom));
retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn));
}
if("Y".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date_n protect='1'>").append("<![CDATA[" + retdateN + "]]>").append("</retirement_date_n>\r\n");
}
else if(currentColumn.trim().equalsIgnoreCase("period_amended"))
else
{
valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + retdateN + "]]>").append("</retirement_date_n>\r\n");
}
//Modified by Rohini T on[14/06/19][End]
}
//Modified by Rohini T on[14/06/19][start]
/*else if(currentColumn.trim().equalsIgnoreCase("period_amended"))
{
System.out.println("Inside period_amended itemchange:::::");
//Modified by Rohini R. on [12/06/2019][Start]
......@@ -725,8 +910,11 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
//Modified by Rohini T on[15/05/19][start]
else
{
//Modified by Rohini T on[13/06/19][start]
sql = "select DBF_CALC_RETIRE_DATE( ?,?,?) as retirement_date" +
" from dual";
sql = "select "+varVal+"( ?,?,?) as retirement_date from dual";
//Modified by Rohini T on[13/06/19][end]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setDouble(2, retAgeNew);
......@@ -752,7 +940,7 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
{
dateAf = getCurrdateAppFormat(RetDateDT);
}
if("N".equalsIgnoreCase(retirementDateVarVal) )
if("Y".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date_n protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
......@@ -765,8 +953,155 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
//Modified by Rohini T on[15/05/19][end]
}
}*/
else if(currentColumn.trim().equalsIgnoreCase("period_amended"))
{
System.out.println("Inside period_amended itemchange:::::");
boolean isVarValNull = false;
empCode = genericUtility.getColumnValue("emp_code", dom);
periodAmended = genericUtility.getColumnValue("period_amended", dom);
amendmentType = genericUtility.getColumnValue("amendment_type", dom);
retDtO = genericUtility.getColumnValue("retirement_date_o", dom);
retAgeO = genericUtility.getColumnValue("retirement_age_o", dom);
try
{
periodAmd = (periodAmended != null && periodAmended.trim().length() > 0 ) ?Integer.parseInt(periodAmended):0;
retAgeOld = (retAgeO != null && retAgeO.trim().length() > 0 ) ?Integer.parseInt(retAgeO):0;
}
catch (Exception e)
{
e.getMessage();
}
Timestamp todayDt = new Timestamp(System.currentTimeMillis());
sql = "SELECT PAY_SITE, CADRE, GRADE,BIRTH_DATE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCode = checkNull(rs.getString("PAY_SITE"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
birthDate = rs.getTimestamp("birth_date");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
varVal = checkNull( admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(varVal.equalsIgnoreCase("NULLFOUND"))
{
varVal = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn));
}
retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn));
}
if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal))
{
isVarValNull = true;
}
Calendar cal = null;
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
if("E".equalsIgnoreCase(amendmentType))
{
retAgeNew = retAgeOld + periodAmd;
if(isVarValNull)
{
cal = Calendar.getInstance();
if(retDtO != null )
{
retierDateOld = (Date) format.parse(retDtO);
cal.setTime(retierDateOld);
cal.add(Calendar.MONTH, periodAmd);
}
else
{
retierDateOld = (Date) format.parse(birthDate.toString());
cal.setTime(retierDateOld);
cal.add(Calendar.MONTH, retAgeNew);
}
Date RetDate = cal.getTime();
RetDateDT = new Timestamp(RetDate.getTime());
dateAf = getCurrdateAppFormat(RetDateDT);
}
}
else
{
retAgeNew = retAgeOld - periodAmd;
if(isVarValNull)
{
cal = Calendar.getInstance();
if(retDtO != null)
{
retierDateOld = (Date) format.parse(retDtO);
cal.setTime(retierDateOld);
cal.add(Calendar.MONTH, -periodAmd);
}
else
{
retierDateOld = (Date) format.parse(birthDate.toString());
cal.setTime(retierDateOld);
cal.add(Calendar.MONTH, retAgeNew);
}
Date RetDate = cal.getTime();
RetDateDT = new Timestamp(RetDate.getTime());
dateAf = getCurrdateAppFormat(RetDateDT);
}
}
if(isVarValNull)
{
valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>");
}
else
{
sql = "select "+varVal+"( ?,?,?) as retirement_date" +
" from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setDouble(2, retAgeNew);
pstmt.setTimestamp(3, birthDate);
rs = pstmt.executeQuery();
if(rs.next())
{
RetDateDT = rs.getTimestamp("retirement_date");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(RetDateDT != null )
{
dateAf = getCurrdateAppFormat(RetDateDT);
}
valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>");
}
if("Y".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date_n protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
else
{
valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
}
//Modified by Rohini T on[14/06/19][End]
}
valueXmlString.append("</Detail1>\r\n");
break;
}
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmployeeServicePrdAmdConf.java
View file @ ae5cb6ea
......@@ -103,14 +103,20 @@ public class EmployeeServicePrdAmdConf extends ActionHandlerEJB implements Emplo
rs.close();
rs = null;
}
if( confirmed != null && "Y".equalsIgnoreCase(confirmed) )
//Modified by Rohini T. on [14/06/2019][Start]
if("Y".equalsIgnoreCase(cancelled))
//if( confirmed != null && "Y".equalsIgnoreCase(confirmed) )
//Modified by Rohini T. on [14/06/2019][End]
{
errString = itmdbAccess.getErrorString("", "VTEMPSPA05", "", "", conn);//system should not allow to confirm the same.
errString = itmdbAccess.getErrorString("", "VTEMPSPA07", "", "", conn);//This transaction has already been canceled.
return errString;
}
else if("Y".equalsIgnoreCase(cancelled))
//Modified by Rohini T. on [14/06/2019][Start]
//else if("Y".equalsIgnoreCase(cancelled))
else if ( confirmed != null && "Y".equalsIgnoreCase(confirmed) )
//Modified by Rohini T. on [14/06/2019][End]
{
errString = itmdbAccess.getErrorString("", "VTEMPSPA07", "", "", conn);//selected transaction already been canceled.
errString = itmdbAccess.getErrorString("", "VTEMPSPA05", "", "", conn);//This transaction which you are trying to access is already confirmed, you canot edit or confirm it again.
return errString;
}
else
......
webitm-adm/module-resource/SQL/A18LSUN006.sql
View file @ ae5cb6ea
......@@ -118,5 +118,12 @@ VALUES ('VTEMPSPA16','Invalid Period Amd','Period amended should not be in decim
--------Modified by Rohini T on [12/06/19][end]---------------------------------------------------
--------Modified by Rohini T on [17/06/19][start]---------------------------------------------------
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('emp_serviceprd_amd','1 ','itm_defaultedit','Y');
commit;
--------Modified by Rohini T on [17/06/19][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