Skip to content

B
business-java
Commit 7acdcb79 authored by arawankar's avatar arawankar
Browse files
Options

Bug fixing in EmpLeaveConf.java 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@163438 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3f4010f0
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 20 deletions
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveConf.java
View file @ 7acdcb79
......@@ -2308,6 +2308,9 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
do
{
sql = "SELECT FN_GET_HOLTBLNO(?,?) AS HOL_TBLNO FROM DUAL";
/*Modified by Anjali Rawankar on [19/09/2017][start]*/
pstmt = conn.prepareStatement(sql);
/*Modified by Anjali Rawankar on [19/09/2017][end]*/
pstmt.setString(1, empCode);
pstmt.setTimestamp(2, lvePrevToDate);
resultSet = pstmt.executeQuery();
......@@ -3052,7 +3055,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
aprvDate = resultSet.getTimestamp("APRV_DATE");
lveStart = resultSet.getString("LEAVE_STARTS");
lveEnd = resultSet.getString("LEAVE_ENDS");
}
}
if(resultSet != null)
{
resultSet.close();
......@@ -3090,7 +3093,6 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
payable = resultSet.getString("PAYABLE");
balOpt = resultSet.getString("BAL_OPT");
}
if(resultSet != null)
{
resultSet.close();
......@@ -3186,25 +3188,33 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
}
else
{
lveTempDate1 = utilMethod.dateTime(utilMethod.RelativeDate(lveTempDate1, 1));
//Modified by Anjali Rawankar on [20/09/2017][Start]
//lveTempDate1 = utilMethod.dateTime(utilMethod.RelativeDate(lveTempDate1, 1));
lveTempDate1 = utilMethod.dateTime(utilMethod.RelativeDate(utilMethod.date(lveTempDate1), 1));
//Modified by Anjali Rawankar on [20/09/2017][End]
leaveStart = "B";
if(lveTempDate1.equals(mDate2))
{
leaveEnd = lveEnd;
break;
}
else
{
leaveEnd = "E";
break;
}
}
}while(((lveTempDate1.before(mDate2)) || (lveTempDate1.equals(mDate2))));
}while((lveTempDate1.before(mDate2)) || (lveTempDate1.equals(mDate2)));
}
if(errCode != null && errCode.trim().length() > 0)
{
isError = true;
break;
}
if(balOpt.equals("Y"))
//Modified by Anjali Rawankar on[20/09/2017][Start]
//if(balOpt.equals("Y"))
if(balOpt.equalsIgnoreCase("Y"))
//Modified by Anjali Rawankar on[20/09/2017][End]
{
boolean allowUpdateNegLeave = (Boolean)this.lveRuleList.get("allow_update_negative_leave");
if(allowUpdateNegLeave == true && museFlag.equals("C"));
......@@ -3268,6 +3278,25 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt2.setTimestamp(7, fVal4);
noRows = pstmt2.executeUpdate();
/*Modified by Anjali Rawankar on[20/09/2017][Start]
*[Purpose : Close preparedstatement]
*/
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
if(noRows != 1)
{
errCode = "DS000NR";
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
/*[Purpose : Close preparedstatement]
* Modified by Anjali Rawankar on[20/09/2017][End]
*/
noRows = 0;
sql3 = "SELECT COUNT(*) AS COUNT FROM EMPLVE_TRACE WHERE TRAN_ID = ? AND EFF_DATE = ? AND UPTO_DATE = ?";
pstmt3 = connectionObject.prepareStatement(sql3);
......@@ -3297,6 +3326,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{
cfDate = fVal3;
}
if(mCnt == 0)
{
......@@ -3311,7 +3341,19 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt4.setTimestamp(7, fVal4);
pstmt4.setDouble(8, updBal);
noRows = pstmt4.executeUpdate();
pstmt4.clearParameters();
/*Modified by Anjali Rawankar on[20/09/2017][Start]
*[Purpose : Close preparedstatement]
*/
//pstmt4.clearParameters();
if(pstmt4 != null)
{
pstmt4.close();
pstmt4 = null;
}
/*[Purpose : Close preparedstatement]
* Modified by Anjali Rawankar on[20/09/2017][End]
*/
if(noRows != 1)
{
errCode = "DS000NR";
......@@ -3332,6 +3374,17 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt5.setTimestamp(3, fVal3);
pstmt5.setTimestamp(4, fVal4);
noRows = pstmt5.executeUpdate();
/*Modified by Anjali Rawankar on[20/09/2017][Start]
*[Purpose : Close preparedstatement]
*/
if(pstmt5 != null)
{
pstmt5.close();
pstmt5 = null;
}
/*[Purpose : Close preparedstatement]
* Modified by Anjali Rawankar on[20/09/2017][End]
*/
if(noRows != 1)
{
errCode = "DS000NR";
......@@ -3345,7 +3398,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
if(nextBal == 0)
{
//break;
}
}
}
if((errCode != null) && errCode.trim().length() > 0)
{
......@@ -3511,7 +3564,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
if((cfDate == null) || (fVal3.before(cfDate)))
{
cfDate = fVal3;
}
}
}
else
{
......@@ -3530,9 +3583,8 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true;
break;
}
}
}
}
mDate = mDate1;
days = 0;
do
......@@ -3574,8 +3626,16 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{
tempToDt = mDate2;
}
noDays = utilMethod.DaysAfter(mDate,tempToDt )+ 1;
if((mDate.equals(mDate1) ) && (lveStart.equals("M")))
/*Modified by Anjali Rawankar on [20/09/2017][Start]
*[Purpose : Used date method of UtilMethod.java]
*/
//noDays = utilMethod.DaysAfter(mDate,tempToDt )+ 1;
//if((mDate.equals(mDate1) ) && (lveStart.equals("M")))
noDays = utilMethod.DaysAfter(utilMethod.date(mDate),utilMethod.date(tempToDt))+ 1;
if((mDate.equals(mDate1) && lveStart.equalsIgnoreCase("M")))
/*[Purpose : Used date method of UtilMethod.java]
*Modified by Anjali Rawankar on [20/09/2017][End]
*/
{
noDays = noDays - 0.5;
}
......@@ -3606,6 +3666,17 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt7.setString(7, period);
pstmt7.setString(8, museFlag);
noRows = pstmt7.executeUpdate();
/*Modified by Anjali Rawankar on[20/09/2017][Start]
*[Purpose :close preparedstatement]
*/
if(pstmt7 != null)
{
pstmt7.close();
pstmt7 = null;
}
/*[Purpose :close preparedstatement]
* *Modified by Anjali Rawankar on[20/09/2017][Start]
*/
if(noRows != 1)
{
errCode = "DS000NR";
......@@ -3614,14 +3685,20 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true;
break;
}
if (utilMethod.pos("ELVA" , museFlag) > 0)
{
break;
}
mDate = utilMethod.dateTime(utilMethod.RelativeDate(tempToDt,1));
}
while((mDate.before(mDate2)) ||(mDate.equals(mDate2)));
/*Modified by Anjali Rawankar on [20/09/2017][Start]
*[Purpose : used date method of utilmethods.java]
*/
//mDate = utilMethod.dateTime(utilMethod.RelativeDate(tempToDt,1));
mDate = utilMethod.dateTime(utilMethod.RelativeDate(utilMethod.date(tempToDt),1));
/*[Purpose : used date method of utilmethods.java]
* Modified by Anjali Rawankar on [20/09/2017][End]
*/
}while((mDate.before(mDate2)) ||(mDate.equals(mDate2)));
if(errCode != null && errCode.trim().length() > 0)
{
break;
......@@ -3647,10 +3724,20 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
pstmt.close();
pstmt = null;
}
if(balOpt.equals("Y"))
{
effDt1 = utilMethod.dateTime(utilMethod.RelativeDate(mDate1,1));
effDt2 = utilMethod.dateTime(utilMethod.RelativeDate(effDt1,365));
/*Modified by Anjali Rawankar on [20/09/2017][Start]
*[Purpose : used date method of utilmethods.java]
*/
//effDt1 = utilMethod.dateTime(utilMethod.RelativeDate(mDate1,1));
//effDt2 = utilMethod.dateTime(utilMethod.RelativeDate(effDt1,365));
effDt1 = utilMethod.dateTime(utilMethod.RelativeDate(utilMethod.date(mDate1),1));
effDt2 = utilMethod.dateTime(utilMethod.RelativeDate(utilMethod.date(effDt1),365));
/*[Purpose : used date method of utilmethods.java]
* Modified by Anjali Rawankar on [20/09/2017][End]
*/
}
else
{
......@@ -3658,6 +3745,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
java.sql.Timestamp today = null;
today = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.stringToTime("00:00"));
sql = "SELECT COUNT(1) AS COUNT FROM LEAVEBAL WHERE EMP_CODE = ?,AND LVE_CODE = ?,AND EFF_DATE <= ?,AND UPTO_DATE >= ? ";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString( 1, mEmp);
......@@ -3775,7 +3863,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
isError = true;
break;
}
break;
break;
}while(true);//Main Do
/******************To be done after migrating all component*****************/
......@@ -4761,5 +4849,4 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
return fileContent.toString();
}
}
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