Sarita : Committed on 18-09-2019

// Modified by Piyush on 13/09/2019 [To consider IT Dates]
// sql = "SELECT ACCT_PRD,FR_DATE,TO_DATE FROM FINENT_ACCTPRD WHERE FIN_ENTITY = ? AND FR_DATE <= ? AND TO_DATE >= ? ";
// Modified by Piyush on 18/09/2019 [To consider IT Dates in where clause]
//sql = "SELECT ACCT_PRD,CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END AS FR_DATE,CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END AS TO_DATE FROM FINENT_ACCTPRD WHERE FIN_ENTITY = ? AND FR_DATE <= ? AND TO_DATE >= ? ";

** IT Flag is not getting updated on saving of payroll voucher considering the IT Dates - defined in FINENT_ACCTPRD/ACCTPRD for the eff_date mentioned in voucher
					
					

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

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

@@ -114,7 +114,11 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 				if(relieveDate == null || relieveDate.trim().length() == 0)
 				{
 					//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 >= ? ";
+					// Modified by Piyush on 13/09/2019 [To consider IT Dates]
+					// sql = "SELECT ACCT_PRD,FR_DATE,TO_DATE FROM FINENT_ACCTPRD WHERE FIN_ENTITY = ? AND FR_DATE <= ? AND TO_DATE >= ? ";
+					// Modified by Piyush on 18/09/2019 [To consider IT Dates in where clause]
+					//sql = "SELECT ACCT_PRD,CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END AS FR_DATE,CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END AS TO_DATE FROM FINENT_ACCTPRD WHERE FIN_ENTITY = ? AND FR_DATE <= ? AND TO_DATE >= ? ";
+					sql = "SELECT ACCT_PRD,CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END AS FR_DATE,CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END AS TO_DATE FROM FINENT_ACCTPRD WHERE FIN_ENTITY = ? AND CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END <= ? AND CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END >= ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, finEntity);
 					pstmt.setTimestamp(2, effDate);
@@ -130,7 +134,11 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 					else
 					{
 						close(pstmt , rs);
-						sql = "SELECT CODE,FR_DATE,TO_DATE FROM ACCTPRD WHERE FR_DATE <= ? AND TO_DATE >= ? ";
+						// sql = "SELECT CODE,FR_DATE,TO_DATE FROM ACCTPRD WHERE FR_DATE <= ? AND TO_DATE >= ? ";
+						// Modified by Piyush on 13/09/2019 [To consider IT Dates]
+						// Modified by Piyush on 18/09/2019 [To consider IT Dates in where clause]
+						// sql = "SELECT CODE,CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END AS FR_DATE,CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END AS TO_DATE  FROM ACCTPRD WHERE FR_DATE <= ? AND TO_DATE >= ? ";
+						sql = "SELECT CODE,CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END AS FR_DATE,CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END AS TO_DATE  FROM ACCTPRD WHERE CASE WHEN IT_FR_DATE IS NULL THEN FR_DATE ELSE IT_FR_DATE END <= ? AND CASE WHEN IT_TO_DATE IS NULL THEN TO_DATE ELSE IT_TO_DATE END >= ? ";
 						pstmt= conn.prepareStatement(sql);
 						pstmt.setTimestamp(1, effDate);
 						pstmt.setTimestamp(2, effDate);
@@ -149,11 +157,31 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 					
 					sql = "";
 					//Modified by Azhar on [17/04/2019][Payroll Voucher IT flag Updation considering Financial Entity][Start]
+					// Modified by Piyush on 13/09/2019 [To optimize the query].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.setTimestamp(2, frDate);
 					pstmt.setTimestamp(3, toDate);
+					*/
+
+					String lastPrdOfITYear = "";
+					sql = "SELECT CODE FROM PERIOD WHERE FR_DATE <= ? AND TO_DATE >= ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setTimestamp(1, toDate);
+					pstmt.setTimestamp(2, toDate);
+					rs = pstmt.executeQuery();
+					if (rs.next())
+					{
+						lastPrdOfITYear = rs.getString("CODE");
+					}
+					close(pstmt , rs);
+					sql = "SELECT CONFIRMED FROM PAYROLL WHERE EMP_CODE = ? AND PRD_CODE = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, empCode);
+					pstmt.setString(2, lastPrdOfITYear);
+					// Modified by Piyush on 13/09/2019 [To optimize the query].End
 					rs = pstmt.executeQuery();
 					//Modified by Azhar on [17/04/2019][Payroll Voucher IT flag Updation considering Financial Entity][End]
 					if(rs.next())
@@ -320,4 +348,4 @@ public class PayrVoucherPos extends ValidatorEJB implements PayrVoucherPosLocal
 		}
 	}
 	
-}
\ No newline at end of file
+}