EmpLeaveConf.java

-Changes made to update today's date in status_date and aprv_date column.

EmpLvePrkBalTrfDefault.java
- Changes made to show error message if data already exist in detail
- Changes made to update exp_date proper in detail
 
 LveEncArrCanc.java
 -Changes made to check leave encashment arrears cancellation by aprv_date order


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191191 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveConf.java

@@ -3508,7 +3508,11 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 		java.sql.Timestamp cfDate = null, cfDatelist[] = null; 
 		long row = 0;
 		boolean isError = false;
-
+		
+		//Modified by Anjali R. on[20/09/2018][Start]
+		java.sql.Timestamp todaysDate = null;
+		//Modified by Anjali R. on[20/09/2018][End]
+		
 		String sql = "", sql1 = "", sql2 = "", sql3 = "" , sql4 = "", sql5 = "", sql6 = "", sql7 = "";
 		PreparedStatement pstmt = null, pstmt1 = null, pstmt2 = null, pstmt3 = null, pstmt4 = null, pstmt5 = null, pstmt6 = null, pstmt7 = null;
 		ResultSet resultSet = null,  resultSet1 = null, resultSet2 = null, resultSet3 = null, resultSet4 = null, resultSet5 = null, resultSet6 = null, resultSet7 = null ;
@@ -3527,7 +3531,11 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 			//connectionObject = getConnection();
 			chgTime = utilMethod.dateTime(utilMethod.todaySqlDate(),utilMethod.now());
 			mDate3 = utilMethod.dateTime(utilMethod.todaySqlDate());
-
+			
+			//Modified by Anjali R. on[20/09/2018][To get todays date][Start]
+			todaysDate = new java.sql.Timestamp(System.currentTimeMillis());
+			//Modified by Anjali R. on[20/09/2018][To get todays date][End]
+			
 			mAmt = 0;
 			this.errXml = "";
 			cfDate = null;
@@ -4339,15 +4347,22 @@ public class EmpLeaveConf extends ActionHandlerEJB implements EmpLeaveConfLocal,
 				}
 				if(saveFlag == 2)
 				{
-
+					
+					
 					noRows = 0;
 					sql = "UPDATE EMPLEAVE SET STATUS = 'A', ENCH_AMT = ?,STATUS_DATE = ?,EMP_CODE__APRV = ?,TRAN_ID__PAYR = ?,APRV_DATE = ? WHERE TRAN_ID = ?";
 					pstmt = connectionObject.prepareStatement(sql);
 					pstmt.setDouble(1, mAmt);
-					pstmt.setTimestamp(2, mDate3);
+					//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][Start]
+					//pstmt.setTimestamp(2, mDate3);
+					pstmt.setTimestamp(2, todaysDate);
+					//Modified by Anjali R. on[20/09/2018][Status_date should be todays date with time][End]
 					pstmt.setString(3,this.loginEmpCode);
 					pstmt.setString(4,null);
-					pstmt.setTimestamp(5,chgTime);
+					//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
+					//pstmt.setTimestamp(5,chgTime);
+					pstmt.setTimestamp(5,todaysDate);
+					//Modified by Anjali R. on[20/09/2018][APRV_DATE should be todays date with time][Start]
 					pstmt.setString(6, tranId);
 					noRows = pstmt.executeUpdate();
 					if(pstmt != null)

webitm-adm/ibase/webitm/ejb/adm/adv/EmpLvePrkBalTrfDefault.java

@@ -17,6 +17,7 @@ import org.w3c.dom.NodeList;
 
 import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ActionHandlerEJB;
+import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.adm.AdmCommon;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
@@ -109,12 +110,19 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
 		int totalRowCnt = 0;
 		int deletedRowCnt = 0;
 		NodeList parentNodeListDet2 = null;
+		//Modified by Anjali R. on[24/09/2018][Start]
+		ITMDBAccessEJB itmDbAccessEjb = null;
+		String errorMsg = "";
+		//Modified by Anjali R. on[24/09/2018][End]
 
 		objName = checkNull( getObjName( dom ,"1" ) );
 		System.out.println("objName ..:: ["+objName+"]");
 		try
 		{
 			genericUtility = new E12GenericUtility();	
+			//Modified by Anjali R. on[24/09/2018][Start]
+			itmDbAccessEjb = new ITMDBAccessEJB();
+			//Modified by Anjali R. on[24/09/2018][End]
 			SimpleDateFormat sdf = new SimpleDateFormat( genericUtility.getApplDateFormat() );
 			System.out.println("Default :---->");
 			conn = getConnection();
@@ -140,28 +148,47 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
 				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");
-					return valueXmlBuff.toString();
+				//Modified by Anjali R. on[24/09/2018][Start]
+				//System.out.println("INSIDE totalRowCnt == 0");
+				System.out.println("INSIDE totalRowCnt > 0");
+				//Modified by Anjali R. on[24/09/2018][End]
+
+					//Modified by Anjali R. on[20/09/2018][To show proper error message in case of detail row has data][Start]
+					/*valueXmlBuff.append("</Root>\r\n");
+					return valueXmlBuff.toString();*/
+					errorMsg  =  itmDbAccessEjb.getErrorString("", "VTELPTRF27", "","",conn);
+					return errorMsg;
+					//Modified by Anjali R. on[20/09/2018][To show proper error message in case of detail row has data][End]
 				}
-				if(totalRowCnt == 0)
+				//Modified by Anjali R. on[20/09/2018][Added else condition][Start]
+				//if(totalRowCnt == 0)
+				else
+				//Modified by Anjali R. on[20/09/2018][Added else condition][End]
 				{
 					
 					//valueXmlBuff.append("<line_no>").append("<![CDATA[").append( lineNo ).append("]]>").append("</line_no>\r\n");
 			
 					if ( "PRK".equalsIgnoreCase( tranType ) ) 
 					{
-						sql = " SELECT AD_CODE, START_DATE, END_DATE, AMT_BAL, FN_GET_LVEPRK_DESCR( 'PRK' , AD_CODE ) AS BALANCE_CODE_DESCR FROM ALLOWDEDN_BAL WHERE EMP_CODE= ? AND REF_TYPE='K' AND AMT_BAL <> 0 ";
+					totalRowCnt = 0;//Modified by Anjali R. on [24/09/2018]
+					//Modified by Anjali R. on[20/09/2018][Start]
+					//sql = " SELECT AD_CODE, START_DATE, END_DATE, AMT_BAL, FN_GET_LVEPRK_DESCR( 'PRK' , AD_CODE ) AS BALANCE_CODE_DESCR FROM ALLOWDEDN_BAL WHERE EMP_CODE= ? AND REF_TYPE='K' AND AMT_BAL <> 0 ";
+					sql = " SELECT AD_CODE, START_DATE, END_DATE, AMT_BAL, FN_GET_LVEPRK_DESCR( 'PRK' , AD_CODE ) AS BALANCE_CODE_DESCR , EXP_DATE FROM ALLOWDEDN_BAL WHERE EMP_CODE= ? AND REF_TYPE='K' AND AMT_BAL <> 0 ";
+					//Modified by Anjali R. on[20/09/2018][End]
 						pstmt = conn.prepareStatement( sql );
 						pstmt.setString(1, empCodeFrom);
 						rs = pstmt.executeQuery();
 						while ( rs.next() )
 						{
+							totalRowCnt ++;//Modified by Anjali R. on [24/09/2018]
 							adCode = checkNull( rs.getString( "AD_CODE" ) );
 							startDate =  rs.getDate( "START_DATE" );
 							endDate = rs.getDate( "END_DATE" );
 							balance = rs.getDouble( "AMT_BAL" );
 							balCodeDescr = checkNull( rs.getString( "BALANCE_CODE_DESCR" ) );
+							//Modified by Anjali R. on[20/09/2018][Start]
+							expDate = rs.getDate("EXP_DATE");
+							//Modified by Anjali R. on[20/09/2018][End]
 							
 							System.out.println("balCodeDescr [:" +balCodeDescr+ "] "+"adCode [:" +adCode+ "] "+
 									"startDate [:" +startDate+ "] "+"endDate [:" +endDate+ "] "+
@@ -172,14 +199,23 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
 							valueXmlBuff.append("<balance_code_descr>").append("<![CDATA[").append( balCodeDescr ).append("]]>").append("</balance_code_descr>\r\n");
 							valueXmlBuff.append("<from_date>").append("<![CDATA[").append( ( startDate == null ? "" : sdf.format( startDate ) ) ).append("]]>").append("</from_date>\r\n");
 							valueXmlBuff.append("<to_date>").append("<![CDATA[").append( endDate == null ? "" : sdf.format( endDate ) ).append("]]>").append("</to_date>\r\n");
-							valueXmlBuff.append("<exp_date>").append("<![CDATA[").append( endDate == null ? "" : sdf.format( endDate ) ).append("]]>").append("</exp_date>\r\n");
+							//Modified by Anjali R. on[20/09/2018][Start]
+							//valueXmlBuff.append("<exp_date>").append("<![CDATA[").append( endDate == null ? "" : sdf.format( endDate ) ).append("]]>").append("</exp_date>\r\n");
+							valueXmlBuff.append("<exp_date>").append("<![CDATA[").append( expDate == null ? "" : sdf.format( expDate ) ).append("]]>").append("</exp_date>\r\n");
+							//Modified by Anjali R. on[20/09/2018][End]
 							valueXmlBuff.append("<balance>").append("<![CDATA[").append( balance ).append("]]>").append("</balance>\r\n");
 							valueXmlBuff.append("<acct_prd>").append("<![CDATA[").append( acctPrd ).append("]]>").append("</acct_prd>\r\n");
 							valueXmlBuff.append("<lve_unit>").append("<![CDATA[").append( lveUnit ).append("]]>").append("</lve_unit>\r\n");
 							valueXmlBuff.append("<encashable>").append("<![CDATA[").append( encashable ).append("]]>").append("</encashable>\r\n");
 							valueXmlBuff.append("</Detail>");
 						}
-						
+					//Modified by Anjali R. on [24/09/2018][If no records exist][Start]
+					if(totalRowCnt == 0)
+					{
+						errorMsg  =  itmDbAccessEjb.getErrorString("", "VTELPTRF28", "","",conn);
+						return errorMsg;
+					}
+					//Modified by Anjali R. on [24/09/2018][If no records exist][End]
 						rs.close();
 						rs = null;
 						pstmt.close();
@@ -208,6 +244,7 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
 					}
 					else if ( "LVE".equalsIgnoreCase( tranType ) )
 					{
+					totalRowCnt = 0;//Modified by Anjali R. on [24/09/2018]
 						//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= ? " 
@@ -221,6 +258,7 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
 						rs = pstmt.executeQuery();
 						while( rs.next() )
 						{
+							totalRowCnt ++;//Modified by Anjali R. on [24/09/2018]
 							lveCode = checkNull( rs.getString( "LVE_CODE" ) );
 							effDate = rs.getDate( "EFF_DATE" );
 							uptoDate = rs.getDate( "UPTO_DATE" );
@@ -242,6 +280,13 @@ public class EmpLvePrkBalTrfDefault extends ActionHandlerEJB implements EmpLvePr
 							valueXmlBuff.append("<encashable>").append("<![CDATA[").append( encashable ).append("]]>").append("</encashable>\r\n");
 							valueXmlBuff.append("</Detail>");
 						}
+						//Modified by Anjali R. on [24/09/2018][If no records exist][Start]
+						if(totalRowCnt == 0)
+						{
+							errorMsg  =  itmDbAccessEjb.getErrorString("", "VTELPTRF28", "","",conn);
+							return errorMsg;
+						}
+						//Modified by Anjali R. on [24/09/2018][If no records exist][End]
 						if( rs != null )
 						{
 							rs.close();

webitm-adm/ibase/webitm/ejb/adm/adv/LveEncArrCanc.java

@@ -127,6 +127,10 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 		HRVoucherReversal hrVoucherReversal = null;
 		SimpleDateFormat simpleDateFormat = null;
 		AdmCommon admCommon = null;
+		
+		//Modified by Anjali R. on [25/09/2018][Start]
+		String remArrTanId = "";
+		//Modified by Anjali R. on [25/09/2018][End]
 		try
 		{
 			E12GenericUtility genericUtility = new E12GenericUtility();
@@ -171,19 +175,26 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 				//errString = "VTADMLVE05";
 				return errString;
 			}
-			sql = "select aprv_date from empleave_ench_arr where tran_id__lve = ? AND status = 'A' order by aprv_date desc";
+			//Modified by Anjali R. on [25/09/2018][Approved/Unconfirmed arrears selection should be based on primary key][Start]
+			//sql = "select aprv_date from empleave_ench_arr where tran_id__lve = ? AND status not in 'X' order by aprv_date desc";
+			sql = "select tran_id from empleave_ench_arr where tran_id__lve = ? AND status not in 'X' order by aprv_date desc";
+			//Modified by Anjali R. on [25/09/2018][Approved/Unconfirmed arrears selection should be based on primary key][End]
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranIdLve);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
-				confDateRem = rs.getTimestamp("aprv_date");
-				if(ConfDateCurrent.before(confDateRem)) 
+				remArrTanId = checkNull(rs.getString("tran_id"));
+				//Modified by Anjali R. on[25/09/2018][Start]
+				//confDateRem = rs.getTimestamp("aprv_date");
+				/*if(ConfDateCurrent.before(confDateRem)) 
 				{
 					errString = itmDBAccessEJB.getErrorString("", "VTADMLVE06", chgUser,"",conn);
 					//errString = "VTADMLVE06";
 					return errString;
-				}
+				}*/
+				//Modified by Anjali R. on[25/09/2018][End]
+				
 			}
 			if(rs != null)
 			{
@@ -195,7 +206,14 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 				pstmt.close();
 				pstmt = null;
 			}
-			
+			//Modified by Anjali R. on [19/09/2018][Start]
+			System.out.println("tranID--["+tranID+"]remArrTanId--["+remArrTanId+"]");
+			if(!(tranID.equalsIgnoreCase(remArrTanId))) 
+			{
+				errString = itmDBAccessEJB.getErrorString("", "VTADMLVE06", chgUser,"",conn);
+				return errString;
+			}
+			//Modified by Anjali R. on [19/09/2018][End]
 			if(tranDate != null) 
 			{
 				tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat());
@@ -453,7 +471,10 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 						System.out.println("count--["+count+"]");
 						if(count > 0)
 						{
-							errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
+							//Modified by Anjaili R. on [24/09/2018][Start]
+							//errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
+							errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "AR", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
+							//Modified by Anjaili R. on [24/09/2018][End]
 							System.out.println("errString--["+errString+"]");
 
 							if(errString != null && errString.trim().length()>0)