EmpEncLeaveCanc.java - changes done by Piyush sir are added

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

webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpEncLeaveCanc.java

@@ -866,6 +866,36 @@ public class EmpEncLeaveCanc extends ActionHandlerEJB  implements EmpEncLeaveCan
 				{
 					if(status.equals("A"))
 					{
+						// Modified by Piyush in 08/08/2019 [To check if any encashment arears existing against leave transaction id].Start
+						int encArrCnt = 0;
+						sql = "SELECT COUNT(1) AS ENCARRCNT FROM EMPLEAVE_ENCH_ARR WHERE TRAN_ID__LVE = ? AND CASE WHEN STATUS IS NULL THEN 'R' ELSE STATUS END <> 'X'";
+						pstmt = connectionObject.prepareStatement(sql);
+						pstmt.setString(1,tranId);
+						resultSet = pstmt.executeQuery();
+						if (resultSet.next())
+						{
+							encArrCnt = resultSet.getInt("ENCARRCNT");
+						}
+						if(resultSet != null)
+						{
+							resultSet.close();
+							resultSet = null;
+						}
+						if(pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						} 
+						if (encArrCnt > 0)
+						{
+							errCode = "VTEMPLVE25";
+							this.errList.add(errCode);
+							this.fldList.add("");
+							break;
+						}
+
+						// Modified by Piyush in 08/08/2019 [To check if any encashment arears existing against leave transaction id].End
+
 						// Modified by Piyush on 15/09/2018.Start
 						String siteCode = "" , cadreCode = "" , gradeCode = "";
 						sql = "SELECT PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = ?";
@@ -1667,7 +1697,9 @@ public class EmpEncLeaveCanc extends ActionHandlerEJB  implements EmpEncLeaveCan
 					pstmt.setDouble(2, enchAmt*-1);
 					//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][Start]
 					pstmt.setTimestamp(3,new java.sql.Timestamp(System.currentTimeMillis()) );
-					pstmt.setString(4,chgUser);
+					// Modified by Piyush on 08/08/2019 [To update change term instead of chg user]
+					// pstmt.setString(4,chgUser);
+					pstmt.setString(4, termId);
 					pstmt.setString(5, chgUser);
 					//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][End]
 					pstmt.setString(6, empCode);
@@ -1707,7 +1739,9 @@ public class EmpEncLeaveCanc extends ActionHandlerEJB  implements EmpEncLeaveCan
 				{
 					//Modified by Anjali R. on [03/01/2019][Start]
 					//retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "PY", "w_empleave", "", adCode,enchAmt*-1 , frDateStr, toDateStr, ExtraParams, conn);
-					retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "AR", "w_empleave", "", adCode,enchAmt*-1 , frDateStr, toDateStr, ExtraParams, conn);
+					// Modified by Piyush on 08/08/2019 [Changed window name as per payarrToProcUpdation to generate entry for unposted payroll also]
+					// retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "AR", "w_empleave", "", adCode,enchAmt*-1 , frDateStr, toDateStr, ExtraParams, conn);
+					retString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "AR", "W_ATTD_PROC_NORULE", "", adCode,enchAmt*-1 , frDateStr, toDateStr, ExtraParams, conn);
 					//Modified by Anjali R. on [03/01/2019][End]
 					System.out.println("retString--["+retString+"]");
 					//Modified by Anjali R. on[19/09/2018][Start]