Payroll Voucher IT Flag Updation considering Financial Entity

PayrVoucherPos.java


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

webitm-adm/ibase/webitm/ejb/adm/PayrVoucherPos.java

@@ -56,11 +56,13 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 	
 	private String executePostSave (Document dom ,String editFlag, String xtraParams, Connection conn)throws RemoteException,ITMException
 	{
-		String empCode = "" , effDateStr = "" , errString = "" ;
+		String empCode = "" , effDateStr = "" , errString = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		Date currDate = new Date();
 		boolean errFound = false;
+		String finEntity = "" , acctPrd = "";
+		Timestamp frDate = null, toDate = null;
 		
 		GenericUtility genericUtility = new GenericUtility();
 		
@@ -72,6 +74,8 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 			empCode = genericUtility.getColumnValue("emp_code",dom);
 			effDateStr = genericUtility.getColumnValue("eff_date",dom);
 			String tranId = genericUtility.getColumnValue("tran_id", dom);
+			finEntity = genericUtility.getColumnValue("fin_entity", dom);
+			System.out.println("finEntity is " + finEntity);
 			System.out.println("effective date is"+effDateStr);
 			System.out.println("tranId is "+tranId);
 			String sql = "" , itProc = "" , relieveDate = "" , workSite = "" , cadre = "" , grade = "";
@@ -109,28 +113,49 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 				
 				if(relieveDate == null || relieveDate.trim().length() == 0)
 				{
-					sql = "";
-					sql = "SELECT CODE FROM ACCTPRD WHERE FR_DATE <= ? AND TO_DATE >= ? ";
-					pstmt= conn.prepareStatement(sql);
-					pstmt.setTimestamp(1, effDate);
+					//Modified by Azhar on [17/04/2019][Payroll Voucher IT flag Updation considering Financial Entity][Start]
+					sql = "SELECT ACCT_PRD,FR_DATE,TO_DATE FROM FINENT_ACCTPRD WHERE FIN_ENTITY = ? AND FR_DATE <= ? AND TO_DATE >= ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, finEntity);
 					pstmt.setTimestamp(2, effDate);
-					
+					pstmt.setTimestamp(3, effDate);
 					rs = pstmt.executeQuery();
+					
 					if(rs.next())
 					{
-						code = checkNull(rs.getString("CODE"));
+						acctPrd = checkNull(rs.getString("ACCT_PRD"));
+						frDate = rs.getTimestamp("FR_DATE");
+						toDate = rs.getTimestamp("TO_DATE");
 					}
-					
+					else
+					{
+						close(pstmt , rs);
+						sql = "SELECT CODE,FR_DATE,TO_DATE FROM ACCTPRD WHERE FR_DATE <= ? AND TO_DATE >= ? ";
+						pstmt= conn.prepareStatement(sql);
+						pstmt.setTimestamp(1, effDate);
+						pstmt.setTimestamp(2, effDate);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							code = checkNull(rs.getString("CODE"));
+							frDate = rs.getTimestamp("FR_DATE");
+							toDate = rs.getTimestamp("TO_DATE");
+						}
+					}
+					//Modified by Azhar on [17/04/2019][Payroll Voucher IT flag Updation considering Financial Entity][End]
 					System.out.println("code field is"+code);
 					//Modified by Anjali R. on [25/07/2018]
 					close(pstmt , rs);
 					
 					sql = "";
-					sql = "SELECT CONFIRMED FROM PAYROLL WHERE EMP_CODE = ? AND PRD_CODE = (SELECT MAX(CODE) FROM PERIOD WHERE ACCT_PRD = ?)";
+					//Modified by Azhar on [17/04/2019][Payroll Voucher IT flag Updation considering Financial Entity][Start]
+					sql = "SELECT CONFIRMED FROM PAYROLL WHERE EMP_CODE = ? AND PRD_CODE = (SELECT MAX(CODE) FROM PERIOD WHERE FR_DATE >= ? AND TO_DATE <= ?)";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, empCode);
-					pstmt.setString(2, code);
+					pstmt.setTimestamp(2, frDate);
+					pstmt.setTimestamp(3, toDate);
 					rs = pstmt.executeQuery();
+					//Modified by Azhar on [17/04/2019][Payroll Voucher IT flag Updation considering Financial Entity][End]
 					if(rs.next())
 					{
 						confirmed = checkNull(rs.getString("CONFIRMED"));