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

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

@@ -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/EmpLvePrkBalTrfConf.java

@@ -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

@@ -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");