Skip to content

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

EmpLeaveConf.java 

-Changes made to check leave balance for use flag  'C' only.(Changes made in lveChkGeneral method)

EmpLvePrkBalTrfConf.java
- Changes made to validate record if unconfirmed record already exist for employee

EmpLvePrkBalTrfDefault.java
-Change condition for total row count greater than 0

EmpLvePrkBalTrfIC.java
-Change made to validate fin entity for employee to and fr employee

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190217 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ee6830cb
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 177 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpLvePrkBalTrfIC.java
View file @ a6df15e0
......@@ -772,8 +772,9 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
}
}
}
//Modified by Anjali R. on [16/08/2018][wrong condition][Start]
//Modified by Anjali R. on [16/08/2018][To validate unconfirmed records for same employee][Start]
cnt =0;
/*cnt =0;
String tranType = checkNull(genericUtility.getColumnValue("tran_type", dom,objContext ));
System.out.println("tranType--["+tranType+"]");
sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? AND TRAN_TYPE = ? AND STATUS <> 'C' ";
......@@ -800,8 +801,11 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
retString = itmDBAccess.getErrorString("", "VTUNCONF01", userId, "", conn);
return retString;
}
}
}*/
//Modified by Anjali R. on [16/08/2018][To validate unconfirmed records for same employee][End]
//Modified by Anjali R. on [16/08/2018][wrong condition][End]
}
}
else if("emp_code__to".equalsIgnoreCase( childNodeName ) )
{
......@@ -926,7 +930,12 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
//sql = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = ? ";
//Modified by Anjali R. on [16/08/2018][To get count of fin entity][Start]
//sql = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE in (?,?) ";
sql = "SELECT COUNT (FIN_ENTITY ) AS CNT FROM SITE WHERE SITE_CODE in( ?,?)";
//Modfied by Anjali R. on [01/09/2018][Take distict fin entity count from site table for to and for employee][Start]
//sql = "SELECT COUNT (FIN_ENTITY ) AS CNT FROM SITE WHERE SITE_CODE in( ?,?)";
sql = "SELECT COUNT(DISTINCT(FIN_ENTITY )) AS CNT FROM SITE WHERE SITE_CODE in( ?,?)";
//Modfied by Anjali R. on [01/09/2018][Take distict fin entity count from site table for to and for employee][End]
//Modified by Anjali R. on [16/08/2018][To get count of fin entity][End]
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, siteCodeFrom );
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveConf.java
View file @ a6df15e0
......@@ -1114,6 +1114,7 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
//This will not check on confirmation
//break;
//Changes by Anjali R. on[16/08/2018][Balance check not perform on confirmation][End]
break;//Added by Anjali R. on[01/09/2018]
}
else if ("C".equals(museFlag))
{
......@@ -1199,210 +1200,146 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
{
break;
}
}
//}Modified by Anjali R. on [01/09/2018][minimum balance check only perform in use flag 'C' condition.]
lveFrMth = admCommon.getAdmEnv(workSite , cadre , grade ,"LVE_FRMTH" , mlveDt,connectionObject);
if(lveFrMth == null || lveFrMth.trim().length() == 0 || lveFrMth.indexOf("NULLFOUND") > 0)
{
lveFrMth = admCommon.getEnv("999999", "LVE_FRMTH",connectionObject);
if(lveFrMth.equals("NULLFOUND"))
lveFrMth = admCommon.getAdmEnv(workSite , cadre , grade ,"LVE_FRMTH" , mlveDt,connectionObject);
if(lveFrMth == null || lveFrMth.trim().length() == 0 || lveFrMth.indexOf("NULLFOUND") > 0)
{
errCode = "VSENVAR1";
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
lveFrMth = admCommon.getEnv("999999", "LVE_FRMTH",connectionObject);
if(lveFrMth.equals("NULLFOUND"))
{
errCode = "VSENVAR1";
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
else if(utilMethod.left(lveFrMth , 4).equals("ERR~t"))
{
errCode = utilMethod.mid(lveFrMth , 5);
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
}
else if(utilMethod.left(lveFrMth , 4).equals("ERR~t"))
lveToMth = admCommon.getAdmEnv(workSite ,cadre ,grade ,"LVE_TOMTH" , mlveDt,connectionObject);
if(lveToMth == null || lveToMth.trim().length() == 0 || lveToMth.indexOf("NULLFOUND") > 0)
{
errCode = utilMethod.mid(lveFrMth , 5);
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
lveToMth = admCommon.getEnv("999999", "LVE_TOMTH",connectionObject);
if(lveToMth.equals("NULLFOUND"))
{
errCode = "VSENVAR1";
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
}
}
lveToMth = admCommon.getAdmEnv(workSite ,cadre ,grade ,"LVE_TOMTH" , mlveDt,connectionObject);
if(lveToMth == null || lveToMth.trim().length() == 0 || lveToMth.indexOf("NULLFOUND") > 0)
{
lveToMth = admCommon.getEnv("999999", "LVE_TOMTH",connectionObject);
if(lveToMth.equals("NULLFOUND"))
else if(utilMethod.left(lveToMth , 4).equals("ERR~t"))
{
errCode = "VSENVAR1";
errCode = utilMethod.mid(lveToMth , 5);
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
}
else if(utilMethod.left(lveToMth , 4).equals("ERR~t"))
{
errCode = utilMethod.mid(lveToMth , 5);
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
try
{
lveYearFrMth = Integer.parseInt(lveFrMth);
lveYearToMth = Integer.parseInt(lveFrMth);
}
catch (Exception pe)
{
lveYearFrMth = 1;
lveYearToMth = 12;
}
if(lveYearFrMth != 1)
{
lveMon = utilMethod.month(mlveDt);
if (lveMon < lveYearFrMth)
try
{
lveYrFr = lveYrFr - 1;
lveYearFrMth = Integer.parseInt(lveFrMth);
lveYearToMth = Integer.parseInt(lveFrMth);
}
else
catch (Exception pe)
{
lveYrTo = lveYrTo + 1;
lveYearFrMth = 1;
lveYearToMth = 12;
}
lveFrDt = utilMethod.dateTime(utilMethod.date(lveYrFr, lveYearFrMth , 1));
lveToDt = utilMethod.dateTime(utilMethod.date(lveYrTo, lveYearToMth , 31));
}
else
{
lveFrDt = utilMethod.dateTime(utilMethod.date(lveYrFr, 1, 1));
lveToDt = utilMethod.dateTime(utilMethod.date(lveYrTo, 12, 31));
}
if( minAllowed != 0 && mNoDays > 0 && mNoDays < minAllowed)
{
errCode = "VTEMPLVE7";
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
if ("E".equalsIgnoreCase(errType))
if(lveYearFrMth != 1)
{
isError = true;
break;
lveMon = utilMethod.month(mlveDt);
if (lveMon < lveYearFrMth)
{
lveYrFr = lveYrFr - 1;
}
else
{
lveYrTo = lveYrTo + 1;
}
lveFrDt = utilMethod.dateTime(utilMethod.date(lveYrFr, lveYearFrMth , 1));
lveToDt = utilMethod.dateTime(utilMethod.date(lveYrTo, lveYearToMth , 31));
}
else
{
errCode = "";
lveFrDt = utilMethod.dateTime(utilMethod.date(lveYrFr, 1, 1));
lveToDt = utilMethod.dateTime(utilMethod.date(lveYrTo, 12, 31));
}
}
if ( maxAllowed != 0 && mNoDays > maxAllowed)
{
errCode = "VTEMPLVE8";
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
if ("E".equalsIgnoreCase(errType))
if( minAllowed != 0 && mNoDays > 0 && mNoDays < minAllowed)
{
isError = true;
break;
errCode = "VTEMPLVE7";
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
if ("E".equalsIgnoreCase(errType))
{
isError = true;
break;
}
else
{
errCode = "";
}
}
else
if ( maxAllowed != 0 && mNoDays > maxAllowed)
{
errCode = "";
errCode = "VTEMPLVE8";
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
if ("E".equalsIgnoreCase(errType))
{
isError = true;
break;
}
else
{
errCode = "";
}
}
}
if(tranId == null)
{
tranId = "";
}
noRows = 0;
sql ="sELECT COUNT(*) AS COUNT FROM EMPLEAVE WHERE EMP_CODE = ? AND LVE_DATE_FR >= ? "+
" AND LVE_DATE_TO <= ? AND LVE_CODE = ? AND STATUS = 'A' "+
" AND USE_FLAG = 'C' AND TRAN_ID <> NVL(?,' ')";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,memp);
pstmt.setTimestamp(2,lveFrDt);
pstmt.setTimestamp(3,lveToDt);
pstmt.setString(4, mLeave);
pstmt.setString(5, tranId);
resultSet = pstmt.executeQuery();
while(resultSet.next())
{
noRows++;
noofTimes = resultSet.getInt(1);
}
if(resultSet != null)
{
resultSet.close();
resultSet = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if (noofTimes + 1 > maxTimes && maxTimes > 0)
{
errCode = "VTEMPLVE9" ;
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
if ("E".equalsIgnoreCase(errType))
if(tranId == null)
{
isError = true;
break;
tranId = "";
}
else
{
errCode = "";
noRows = 0;
sql ="sELECT COUNT(*) AS COUNT FROM EMPLEAVE WHERE EMP_CODE = ? AND LVE_DATE_FR >= ? "+
" AND LVE_DATE_TO <= ? AND LVE_CODE = ? AND STATUS = 'A' "+
" AND USE_FLAG = 'C' AND TRAN_ID <> NVL(?,' ')";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,memp);
pstmt.setTimestamp(2,lveFrDt);
pstmt.setTimestamp(3,lveToDt);
pstmt.setString(4, mLeave);
pstmt.setString(5, tranId);
resultSet = pstmt.executeQuery();
while(resultSet.next())
{
noRows++;
noofTimes = resultSet.getInt(1);
}
}
noRows = 0;
sql = "SELECT PAYABLE FROM LEAVES WHERE LVE_CODE = ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,mLeave);
resultSet = pstmt.executeQuery();
while(resultSet.next())
{
noRows++;
payable = resultSet.getString("PAYABLE");
}
if(resultSet != null)
{
resultSet.close();
resultSet = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(noRows == 0)
{
errCode = "VMLVECD1" ;
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
//Modified by Anjali R. on [20/08/2018][Check equal ignore case while comparing two strings][Start]
//if(payable.equals("Y"))
System.out.println("payable--["+payable+"]");
if("Y".equalsIgnoreCase(payable))
//Modified by Anjali R. on [20/08/2018][Check equal ignore case while comparing two strings][End]
{
errCode = "";
System.out.println("nvoNo--["+nvoNo+"]");
if(nvoNo == 1)
if(resultSet != null)
{
errCode = leaveRules1(memp, mLeave, mPrd, mlveDt,mlvedtTo, mNoDays , tranId,connectionObject);
resultSet.close();
resultSet = null;
}
else if(nvoNo == 2)
if(pstmt != null)
{
//Modified by Anjali R. on[20/08/2018][Added updated method of leaves rule 2][Start]
//errCode = leaveRules2(memp, mLeave, mlveDt, mlvedtTo,connectionObject );
errCode = leaveRules2(memp, mLeave, mlveDt, mlvedtTo,tranId,connectionObject );
System.out.println("errCode from leaveRules2---["+errCode+"]");
//Modified by Anjali R. on[20/08/2018][Added updated method of leaves rule 2][End]
pstmt.close();
pstmt = null;
}
if(errCode != null && errCode.trim().length() > 0)
if (noofTimes + 1 > maxTimes && maxTimes > 0)
{
errCode = "VTEMPLVE9" ;
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
......@@ -1416,7 +1353,72 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
errCode = "";
}
}
}
noRows = 0;
sql = "SELECT PAYABLE FROM LEAVES WHERE LVE_CODE = ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1,mLeave);
resultSet = pstmt.executeQuery();
while(resultSet.next())
{
noRows++;
payable = resultSet.getString("PAYABLE");
}
if(resultSet != null)
{
resultSet.close();
resultSet = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(noRows == 0)
{
errCode = "VMLVECD1" ;
this.errList.add(errCode);
this.fldList.add("");
isError = true;
break;
}
//Modified by Anjali R. on [20/08/2018][Check equal ignore case while comparing two strings][Start]
//if(payable.equals("Y"))
System.out.println("payable--["+payable+"]");
if("Y".equalsIgnoreCase(payable))
//Modified by Anjali R. on [20/08/2018][Check equal ignore case while comparing two strings][End]
{
errCode = "";
System.out.println("nvoNo--["+nvoNo+"]");
if(nvoNo == 1)
{
errCode = leaveRules1(memp, mLeave, mPrd, mlveDt,mlvedtTo, mNoDays , tranId,connectionObject);
}
else if(nvoNo == 2)
{
//Modified by Anjali R. on[20/08/2018][Added updated method of leaves rule 2][Start]
//errCode = leaveRules2(memp, mLeave, mlveDt, mlvedtTo,connectionObject );
errCode = leaveRules2(memp, mLeave, mlveDt, mlvedtTo,tranId,connectionObject );
System.out.println("errCode from leaveRules2---["+errCode+"]");
//Modified by Anjali R. on[20/08/2018][Added updated method of leaves rule 2][End]
}
if(errCode != null && errCode.trim().length() > 0)
{
this.errList.add(errCode);
this.fldList.add("");
String errType = getErrorType(errCode , connectionObject);
if ("E".equalsIgnoreCase(errType))
{
isError = true;
break;
}
else
{
errCode = "";
}
}
}
}//Modified by Anjali R. on [01/09/2018]
break;
}
while(true);
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLvePrkBalTrfConf.java
View file @ a6df15e0
......@@ -127,6 +127,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
String siteCode = "";
String workSite = "";
String paySite = "";
int cnt = 0;//Modified by Anjali R. on [01/09/2018]
ITMDBAccessEJB itmDBAccess = null;
EmpLeaveConf empLeaveConf = null;
E12GenericUtility genericUtility = new E12GenericUtility();
......@@ -215,7 +216,35 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
successFlag = false;
return retString;
}
//Modified by Anjali R. on [01/09/2018][To validate unconfirmed records for same employee][Start]
System.out.println("tranType--["+tranType+"]");
sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? AND TRAN_TYPE = ?"
+ " AND STATUS NOT IN('C','X') AND TRAN_ID <> ? ";
pStmt = conn.prepareStatement(sql);
pStmt.setString(1, empCodeFr);
pStmt.setString(2, tranType);
pStmt.setString(3, tranId);
rs = pStmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pStmt != null)
{
pStmt.close();
pStmt = null;
}
if(cnt > 0)
{
retString = itmDBAccess.getErrorString("", "VTUNCONF01", userId, "", conn);
return retString;
}
//Modified by Anjali R. on [01/09/2018][To validate unconfirmed records for same employee][End]
sql = " SELECT COUNT(*) AS ROW_CNT FROM EMP_LVEPRKBAL_TRFDET WHERE TRAN_ID = ? ";
pStmt = conn.prepareStatement(sql);
pStmt.setString(1, tranId);
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLvePrkBalTrfDefault.java
View file @ a6df15e0
......@@ -135,7 +135,10 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
totalRowCnt = totalRowCnt - deletedRowCnt;
}
System.out.println("[EmpLvePrkBalTrfDefault] detail2 length==================>"+totalRowCnt);
if(totalRowCnt > 1)
//Modfied by Anjali R. on[01/09/2018][Change condition to check total row count is greater than 0][Start]
//if(totalRowCnt > 1)
if(totalRowCnt > 0)
//Modfied by Anjali R. on[01/09/2018][Change condition to check total row count is greater than 0][End]
{
System.out.println("INSIDE totalRowCnt == 0");
valueXmlBuff.append("</Root>\r\n");
......
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