Commit b267e3b7 authored by arawankar's avatar arawankar

Changes made in below components:

EmpLeaveConf.java
--Changes made to not validate minimum balance while confirming
EmpLvePrkBalTrfConf.java
--Changes amde to validate amount balance in perk
EmpLvePrkBalTrfDefault.java
--Changes made to show only data which will have leave balance greater than 0 in leave , and amount balance greater than 0 in perk case
EmpLvePrkBalTrfIC.java
--Changes made to set employee fr site 
--Added validation for same fin entity belongs to emp code fr and emp code to respectively

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189343 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b03bc483
......@@ -1028,7 +1028,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close();
pstmt = null;
}
if (noRows == 0 || balDays <= 0)
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][Start]
//This will not check on confirmation
/*if (noRows == 0 || balDays <= 0)
{
errCode = "VTEMPLVE1";
fldName = "emp_code";
......@@ -1049,8 +1051,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true;
break;
}
}
}*/
//This will not check on confirmation
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][End]
}
}
break;
......@@ -1083,7 +1086,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close();
pstmt = null;
}
if (noRows == 0 || balDays <= 0)
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][Start]
//This will not check on confirmation
/*if (noRows == 0 || balDays <= 0)
{
errCode = "VTEMPLVE1";
fldName = "emp_code";
......@@ -1104,8 +1109,10 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true;
break;
}
}
break;
}*/
//This will not check on confirmation
//break;
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][End]
}
else if ("C".equals(museFlag))
{
......
......@@ -98,7 +98,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
String successString = "";
ResultSet rs = null;
ResultSet rs1 = null;
PreparedStatement pStmt = null, pStmt1 = null, pStmt2 = null, pStmt3 = null, pStmt4 = null, pStmt5 = null, pStmt6 = null;
PreparedStatement pStmt = null, pStmt1 = null, pStmt2 = null, pStmt3 = null, pStmt4 = null, pStmt5 = null, pStmt6 = null,pStmt7 = null;
CallableStatement callStmt = null;
String sql = "";
Timestamp tranDate = null;
......@@ -132,6 +132,10 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
E12GenericUtility genericUtility = new E12GenericUtility();
boolean successFlag = true;
StringBuffer xmlStringForID = null;
//Added by anjali
double orgAmtBal = 0.0;
try {
System.out.println("Inside confirm method of EmpLvePrkBalTrfConf");
//Added & Commented by sarita to create object instead creating lookup for ITMDBAccessEJB on 20 JULY 18 [START]
......@@ -498,8 +502,12 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
retString = itmDBAccess.getErrorString("", outParam.trim(), userId, "", conn);
successFlag = false;
}
//Changed by varsha v. [16/08/2018][To rollback ,if out parameter is not null in procedure ][Start]
else
{
successFlag = true;
}
//Changed by varsha v. [16/08/2018][To rollback ,if out parameter is not null in procedure ][End]
} catch (SQLException se) {
se.printStackTrace();
retString = this.admCommon.getErrorMessage(se, "");
......@@ -555,6 +563,11 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
String procSql = "{call " + admEnvReturn + "(?,?,?,?,?)}";
callStmt = conn.prepareCall(procSql);
//Added by Anjali R. on[16/08/2018][To give error if amount balance is changes after inserting record in EMP_LVEPRKBAL_TRFHDR][Start]
sql = "select amt_bal from allowdedn_bal where emp_code =? and ad_code =? and start_date = ? and end_date = ?";
pStmt7 = conn.prepareStatement(sql);
//Added by Anjali R. on[16/08/2018][To give error if amount balance is changes after inserting record in EMP_LVEPRKBAL_TRFHDR][End]
sql = " SELECT ACCT_PRD, BALANCE_CODE , ENCASHABLE, LVE_UNIT, FROM_DATE, TO_DATE, EXP_DATE, BALANCE FROM EMP_LVEPRKBAL_TRFDET WHERE TRAN_ID = ? GROUP BY ACCT_PRD, BALANCE_CODE, ENCASHABLE, LVE_UNIT, FROM_DATE, to_date, exp_date, BALANCE ";
pStmt = conn.prepareStatement(sql);
......@@ -578,6 +591,24 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
String tranIdGen = tg.generateTranSeqID(refSer, "", keyString, conn);
System.out.println("Umakanta::uniqueKey[" + tranIdGen + "]");
//Added by Anjali R. on[16/08/2018][To give error if amount balance is changes after inserting record in EMP_LVEPRKBAL_TRFHDR][Start]
pStmt7.setString(1,empCodeFr);
pStmt7.setString(2, balCode);
pStmt7.setTimestamp(3, frDate);
pStmt7.setTimestamp(4, toDate);
rs1 = pStmt7.executeQuery();
while(rs1.next())
{
orgAmtBal = rs1.getDouble("amt_bal");
}
System.out.println("orgAmtBal--["+orgAmtBal+"]perkBalance["+perkBalance+"]");
if(orgAmtBal != perkBalance)
{
retString = itmDBAccess.getErrorString("", "VTELPTRF25", userId, "", conn);
successFlag = false;
return retString;
}
//Added by Anjali R. on[16/08/2018][To give error if amount balance is changes after inserting record in EMP_LVEPRKBAL_TRFHDR][End]
pStmt1.setString(1, tranIdGen);
pStmt1.setTimestamp(2, curDateTm);
pStmt1.setString(3, empCodeFr);
......
......@@ -205,9 +205,14 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
}
else if ( "LVE".equalsIgnoreCase( tranType ) )
{
//Modified by Anjali R. on [14/08/2018][To do not show records which is having o balance days][Start]
/*sql = " SELECT LEAVEBAL.LVE_CODE, LEAVEBAL.EFF_DATE, LEAVEBAL.UPTO_DATE, LEAVEBAL.EXP_DATE, LEAVEBAL.ACCT_PRD, LEAVEBAL.LVE_UNIT, LEAVEBAL.ENCASHABLE, "
+" LEAVEBAL.BAL_DAYS,FN_GET_LVEPRK_DESCR( 'LVE' , LVE_CODE) AS BALANCE_CODE_DESCR FROM LEAVEBAL LEAVEBAL INNER JOIN EMPLOYEE EMPLOYEE ON LEAVEBAL.EMP_CODE = EMPLOYEE.EMP_CODE WHERE EMPLOYEE.EMP_CODE= ? "
+" AND LEAVEBAL.EXP_DATE > EMPLOYEE.RELIEVE_DATE ";*/
sql = " SELECT LEAVEBAL.LVE_CODE, LEAVEBAL.EFF_DATE, LEAVEBAL.UPTO_DATE, LEAVEBAL.EXP_DATE, LEAVEBAL.ACCT_PRD, LEAVEBAL.LVE_UNIT, LEAVEBAL.ENCASHABLE, "
+" LEAVEBAL.BAL_DAYS,FN_GET_LVEPRK_DESCR( 'LVE' , LVE_CODE) AS BALANCE_CODE_DESCR FROM LEAVEBAL LEAVEBAL INNER JOIN EMPLOYEE EMPLOYEE ON LEAVEBAL.EMP_CODE = EMPLOYEE.EMP_CODE WHERE EMPLOYEE.EMP_CODE= ? "
+" AND LEAVEBAL.EXP_DATE > EMPLOYEE.RELIEVE_DATE ";
+" AND LEAVEBAL.EXP_DATE > EMPLOYEE.RELIEVE_DATE AND LEAVEBAL.BAL_DAYS <> 0";
//Modified by Anjali R. on [14/08/2018][To do not show records which is having o balance days][End]
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, empCodeFrom );
rs = pstmt.executeQuery();
......
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