*To resolve below issue made changes in following components:

AdmCommon.java
LveEncArrCanc.java

1. Update payarr_to_proc entry if payroll is processed
2. Update or insert chg_date,chg_user and user_term properly in employee_mthad table
3. To update proper encashment amount.

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

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

@@ -168,31 +168,31 @@ public class AdmCommon
 		try
 		{
 			retValue = getSiteEnv(siteCode, "ADM", "G",  grade,  envName,  date,  conn);
-			if(retValue.equals("NULLFOUND"))
+			if(retValue.equalsIgnoreCase("NULLFOUND"))
 			{
 				retValue = getSiteEnv(siteCode, "ADM", "C",  cadre,  envName,  date,  conn);
-				if(retValue.equals("NULLFOUND"))
+				if(retValue.equalsIgnoreCase("NULLFOUND"))
 				{
 					retValue = getSiteEnv(siteCode, "ADM", "X", "ZZZZZ",  envName,  date,  conn);
-					if(retValue.equals("NULLFOUND"))
+					if(retValue.equalsIgnoreCase("NULLFOUND"))
 					{
 						// Modified by Piyush on 02/04/2015 [Site code should passed as "99999"].Start
 						/*
 						retValue = getSiteEnv(siteCode, "ADM", "G",  grade,  envName,  date,  conn);
-						if(retValue.equals("NULLFOUND"))
+						if(retValue.equalsIgnoreCase("NULLFOUND"))
 						{
 							retValue = getSiteEnv(siteCode, "ADM", "C",  cadre,  envName,  date,  conn);
-							if(retValue.equals("NULLFOUND"))
+							if(retValue.equalsIgnoreCase("NULLFOUND"))
 							{
 								retValue = getSiteEnv(siteCode, "ADM", "X", "ZZZZZ",  envName,  date,  conn);
 							}
 						}
 						 */
 						retValue = getSiteEnv("99999", "ADM", "G",  grade,  envName,  date,  conn);
-						if(retValue.equals("NULLFOUND"))
+						if(retValue.equalsIgnoreCase("NULLFOUND"))
 						{
 							retValue = getSiteEnv("99999", "ADM", "C",  cadre,  envName,  date,  conn);
-							if(retValue.equals("NULLFOUND"))
+							if(retValue.equalsIgnoreCase("NULLFOUND"))
 							{
 								retValue = getSiteEnv("99999", "ADM", "X", "ZZZZZ",  envName,  date,  conn);
 							}
@@ -461,7 +461,7 @@ public class AdmCommon
 			conn.setAutoCommit(false);
 			stmt = conn.createStatement();
 			adBasic = getEnv("999999", "BASIC", conn);
-			if (adBasic.equals("NULLFOUND"))
+			if (adBasic.equalsIgnoreCase("NULLFOUND"))
 			{
 				errCode = "VSENVAR1";
 				return errCode;
@@ -481,7 +481,7 @@ public class AdmCommon
 				periodTo = "";
 			}
 			startPeriod = getEnv("999999", "START_PRD", conn);
-			if (startPeriod.equals("NULLFOUND"))
+			if (startPeriod.equalsIgnoreCase("NULLFOUND"))
 			{
 				errCode = "VSENVAR1";
 				return errCode;
@@ -546,9 +546,11 @@ public class AdmCommon
 						//Modified by Ahmed on 22/Mar/2017[As instructed by Piyush sir for trimmed value of voucher no as PAYROLL]
 						if(voucherNo != null && !(voucherNo.trim().equalsIgnoreCase("PAYROLL")))
 						{
+	
+						}//Added by Anjali R. on [19/07/2019][To terminate if condition here as per pb code]
 							// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration]
-							// if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY"))
-							if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equals("PY") || winName.equals("W_ATTD_PROC_NORULE") || winName.equals("W_ATTD_MON"))
+						// if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equalsIgnoreCase("PY"))
+						else if ((voucherNo != null && voucherNo.trim().length() > 0) || procType.equalsIgnoreCase("PY") || winName.equalsIgnoreCase("W_ATTD_PROC_NORULE") || winName.equalsIgnoreCase("W_ATTD_MON"))
 							{
 								sqlStr = "SELECT COUNT(*) AS COUNT FROM PAYARR_TO_PROC WHERE EMP_CODE = '"+currEmpCode+"'" +
 										" AND PRD_CODE = '"+currPeriod+"' AND STATUS = 'U' AND PROC_TYPE = '"+procType+"'" ;
@@ -579,7 +581,7 @@ public class AdmCommon
 									TransIDGenerator tg = new TransIDGenerator(XMLString, userId, CommonConstants.DB_NAME);
 									tranID = tg.generateTranSeqID("PAYARR", "tran_id", keyString, conn);
 									System.out.println("Transaction Id Generated [tranID] :: "+tranID);
-									if (tranID.equals("ERROR"))
+								if (tranID.equalsIgnoreCase("ERROR"))
 									{
 										errCode = "VTTRANID";
 										break;
@@ -635,7 +637,7 @@ public class AdmCommon
 								pstmt.close();
 								pstmt = null;
 							}
-						}
+						//}
 					}//End Of If Block
 					rs.close();
 					rs = null;
@@ -651,7 +653,7 @@ public class AdmCommon
 					//conn.rollback();
 					break;
 				}
-				if (adCode != null && adBasic.trim().equals(adCode.trim()))
+				if (adCode != null && adBasic.trim().equalsIgnoreCase(adCode.trim()))
 				{
 					errCode = empBasicUpdate(currEmpCode, adCode, amount, effDate, expDate, conn);
 					System.out.println("errCode Returned From empBasicUpdate()[errCode]......:: "+ errCode);
@@ -1524,7 +1526,7 @@ public class AdmCommon
 			System.out.println("asOfDate in gbfEmp is " + asOfDate);
 			System.out.println("asOfDateStr in gbfEmp is " + asOfDateStr);
 
-			if(relieveDateStr != null && (asOfDate.after(relieveDate) || asOfDate.equals(relieveDate)) && status.trim().equals("S"))
+			if(relieveDateStr != null && (asOfDate.after(relieveDate) || asOfDate.equals(relieveDate)) && status.trim().equalsIgnoreCase("S"))
 			{
 				System.out.println("INSIDE IF LOOP OF GBFEMP (relieveDateStr) " + relieveDateStr);
 
@@ -1532,7 +1534,7 @@ public class AdmCommon
 				return errString;
 
 			}
-			if((loginSite != null && loginSite.trim().length() > 0) && !empSite.trim().equals(loginSite.trim()))
+			if((loginSite != null && loginSite.trim().length() > 0) && !empSite.trim().equalsIgnoreCase(loginSite.trim()))
 			{
 				System.out.println("INSIDE IF LOOP OF GBFEMP (loginsite) " + loginSite);
 
@@ -1606,12 +1608,12 @@ public class AdmCommon
 				if (lsHolScanBase == null || lsHolScanBase.trim().length() == 0 || lsHolScanBase.indexOf("ERR") != -1 || lsHolScanBase.indexOf("NULL") != -1)
 				{
 					lsHolScanBase = getEnv("999999", "HOLIDAY_SCAN_BASE",conn);
-					if(lsHolScanBase.equals("NULLFOUND"))
+					if(lsHolScanBase.equalsIgnoreCase("NULLFOUND"))
 					{
 						lsHolScanBase = "HT";
 					}
 				}
-				else if(sysUtilMethods.left(lsHolScanBase, 4).equals("ERR~t"))
+				else if(sysUtilMethods.left(lsHolScanBase, 4).equalsIgnoreCase("ERR~t"))
 				{
 					lsErrcode = sysUtilMethods.mid(lsHolScanBase, 5) + "Could not fetch environment <HOLIDAY_SCAN_BASE> from site_env table";
 					break;
@@ -1621,7 +1623,7 @@ public class AdmCommon
 				{
 					lsHolScanBase = "HT";
 				}
-				if(lsHolScanBase.equals("HT") || lsHolScanBase.equals("WS"))
+				if(lsHolScanBase.equalsIgnoreCase("HT") || lsHolScanBase.equalsIgnoreCase("WS"))
 				{
 					lsHolScanBase = lsHolScanBase;
 				}
@@ -1634,12 +1636,12 @@ public class AdmCommon
 				if (lsWoffScanBase == null || lsWoffScanBase.trim().length() == 0 || lsWoffScanBase.indexOf("ERR") != -1 || lsWoffScanBase.indexOf("NULL") != -1)
 				{
 					lsWoffScanBase = getEnv("999999", "WOFF_SCAN_BASE",conn);
-					if(lsWoffScanBase.equals("NULLFOUND"))
+					if(lsWoffScanBase.equalsIgnoreCase("NULLFOUND"))
 					{
 						lsWoffScanBase = "HT";
 					}
 				}
-				else if(sysUtilMethods.left(lsWoffScanBase, 4).equals("ERR~t"))
+				else if(sysUtilMethods.left(lsWoffScanBase, 4).equalsIgnoreCase("ERR~t"))
 				{
 					lsErrcode = sysUtilMethods.mid(lsWoffScanBase, 5) + "Could not fetch environment <WOFF_SCAN_BASE> from site_env table";
 					break;
@@ -1649,7 +1651,7 @@ public class AdmCommon
 				{
 					lsWoffScanBase = "HT";
 				}
-				if(lsWoffScanBase.equals("HT") || lsWoffScanBase.equals("WS"))
+				if(lsWoffScanBase.equalsIgnoreCase("HT") || lsWoffScanBase.equalsIgnoreCase("WS"))
 				{
 					lsWoffScanBase = lsWoffScanBase;
 				}
@@ -1658,7 +1660,7 @@ public class AdmCommon
 					lsHolScanBase = "HT";
 				}
 
-				if(lsHolScanBase.equals("WS"))
+				if(lsHolScanBase.equalsIgnoreCase("WS"))
 				{
 					liCnt = 0;
 					sql = "select count(1) as cnt from work_shift where emp_code = ? and from_dt <= ? and to_dt >= ? and shift = 'H'";
@@ -1714,7 +1716,7 @@ public class AdmCommon
 				}
 				else
 				{
-					if(lsWoffScanBase.equals("WS"))
+					if(lsWoffScanBase.equalsIgnoreCase("WS"))
 					{
 						liCnt = 0;
 						sql = "select count(1) as cnt from work_shift where emp_code = ? and from_dt <= ? and to_dt >= ? and shift = 'W'";
@@ -1771,7 +1773,7 @@ public class AdmCommon
 				if(liCnt > 0)
 				{
 					liCnt = 0;
-					if(((lsHoltype.equals("W") && !(lsWoffScanBase.equals("WS"))) || (lsHoltype.equals("H") && !(lsHolScanBase.equals("WS")))) && asScanChangeHoliday.equals("Y"))
+					if(((lsHoltype.equalsIgnoreCase("W") && !(lsWoffScanBase.equalsIgnoreCase("WS"))) || (lsHoltype.equalsIgnoreCase("H") && !(lsHolScanBase.equalsIgnoreCase("WS")))) && asScanChangeHoliday.equalsIgnoreCase("Y"))
 					{
 						liCnt = 0;
 						sql = "select count(*) as cnt from 	change_holiday where emp_code = ? and hol_date_for = ? and hol_type = ? and confirmed = 'Y'";
@@ -1806,7 +1808,7 @@ public class AdmCommon
 				else
 				{
 					liCnt = 0;
-					if(!(lsHolScanBase.equals("WS")) && asScanChangeHoliday.equals("Y"))
+					if(!(lsHolScanBase.equalsIgnoreCase("WS")) && asScanChangeHoliday.equalsIgnoreCase("Y"))
 					{
 						sql = "select count(*) as cnt from  holiday a , change_holiday b where a.hol_tblno = b.hol_tblno and 	a.hol_date  = b.hol_date_for and	b.emp_code = ? and	b.hol_date_to = ? and	a.hol_type = 'H' and	b.confirmed = 'Y'";
 						pstmt = conn.prepareStatement(sql);
@@ -1835,7 +1837,7 @@ public class AdmCommon
 						//break;
 					}
 
-					if(liCnt == 0 && !(lsWoffScanBase.equals("WS")) && asScanChangeHoliday.equals("Y"))
+					if(liCnt == 0 && !(lsWoffScanBase.equalsIgnoreCase("WS")) && asScanChangeHoliday.equalsIgnoreCase("Y"))
 					{
 						liCnt = 0;
 						sql = "select count(*) as cnt from  holiday a , change_holiday b where a.hol_tblno = b.hol_tblno and 	a.hol_date  = b.hol_date_for and	b.emp_code = ? and	b.hol_date_to = ? and a.hol_type = 'W' and	b.confirmed = 'Y'";
@@ -1904,6 +1906,7 @@ public class AdmCommon
 				e.printStackTrace();
 			}
 		}	
+		System.out.println("WOFF_SCAN_BASE --[lsRetVal]-["+lsRetVal+"]");
 		return lsRetVal;
 	}
 

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

@@ -94,6 +94,7 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 	}
 	public String actionHandler(String tranID, String xtraParams, String forcedFlag, Connection conn) throws SQLException, ITMException
 	{
+		System.out.println("Inside actionHandler  tranID=["+tranID+"]xtraParams=["+xtraParams+"]forcedFlag=["+forcedFlag+"]");
 		String sql = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -123,6 +124,9 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 		int cnt = 0;
 		int count =0;
 		double enchAmt = 0.0;
+		//Modified by Dipesh p. on [12/07/2019][Start]
+		double enchAmtDiff = 0.0;
+		//Modified by Dipesh p. on [12/07/2019][End]
 		int updCount = 0;
 		String tranIdLve = "";
 		Timestamp ConfDateCurrent = null;
@@ -134,6 +138,10 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 		//Modified by Anjali R. on [25/09/2018][Start]
 		String remArrTanId = "";
 		//Modified by Anjali R. on [25/09/2018][End]
+		
+		//Modified by Anjali R. on [25/09/2018][Start]
+		String chgTerm = "";
+		//Modified by Anjali R. on [25/09/2018][End]
 		try
 		{
 			E12GenericUtility genericUtility = new E12GenericUtility();
@@ -143,8 +151,15 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 			simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
 
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
-			sql = "select tran_date,tran_id__payr,emp_code,pay_mode,lve_code,PRD_CODE__PAYROLL,ENCH_AMT__NEW,STATUS,aprv_date,tran_id__lve "
+			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");
+			System.out.println("chgUser==["+chgUser+"]chgTerm==["+chgTerm+"]");
+			//Modified by Dipesh p. on [12/07/2019][Start]
+			/*sql = "select tran_date,tran_id__payr,emp_code,pay_mode,lve_code,PRD_CODE__PAYROLL,ENCH_AMT__NEW,STATUS,aprv_date,tran_id__lve "
+					+ "from empleave_ench_arr where tran_id = ?";*/
+			
+			sql = "select tran_date,tran_id__payr,emp_code,pay_mode,lve_code,PRD_CODE__PAYROLL,ENCH_AMT__NEW,STATUS,aprv_date,tran_id__lve,ench_amt__diff  "
 					+ "from empleave_ench_arr where tran_id = ?";
+			//Modified by Dipesh p. on [12/07/2019][End]
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranID);
 			rs = pstmt.executeQuery();
@@ -160,6 +175,9 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 				status = checkNull(rs.getString("STATUS"));
 				ConfDateCurrent = rs.getTimestamp("aprv_date");
 				tranIdLve = checkNull(rs.getString("tran_id__lve"));
+				//Modified by Dipesh p. on [12/07/2019][Start]
+				enchAmtDiff = rs.getDouble("ench_amt__diff");
+				//Modified by Dipesh p. on [12/07/2019][End]
 			}
 			if(rs != null)
 			{
@@ -471,10 +489,18 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 							pstmt.setString(3, adCode);
 							pstmt.setTimestamp(4, frDate);
 							pstmt.setTimestamp(5, toDate);
-							pstmt.setDouble(6, enchAmt * -1);
+							//Modified by Dipesh p. [12/07/2019][Start]
+							//pstmt.setDouble(6, enchAmt * -1);
+							pstmt.setDouble(6, enchAmtDiff * -1);
+							//Modified by Dipesh p. [12/07/2019][End]
 							pstmt.setTimestamp(7,new java.sql.Timestamp(System.currentTimeMillis()) );
 							pstmt.setString(8,chgUser);
-							pstmt.setString(9, chgUser);
+							
+							//Modified by Anjali R. [19/07/2019][Start]
+							//pstmt.setString(9, chgUser);
+							pstmt.setString(9, chgTerm);
+							//Modified by Anjali R. [19/07/2019][End]
+							
 							pstmt.setString(10, refNo);
 							updCount = pstmt.executeUpdate();
 							if(pstmt != null)
@@ -496,11 +522,16 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 							//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][End]
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, refNo);
-							pstmt.setDouble(2, enchAmt*-1);
-
+							//Modified by Dipesh p. [12/07/2019][start]
+							//pstmt.setDouble(2, enchAmt*-1);
+							pstmt.setDouble(2, enchAmtDiff * -1);
+							//Modified by Dipesh p. [12/07/2019][End]
 							//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 Anjali R. [19/07/2019][To update chg_date,chg_term and chg_usr][Start]
+							//pstmt.setString(4,chgUser);
+							pstmt.setString(4,chgTerm);
+							//Modified by Anjali R. [19/07/2019][To update chg_date,chg_term and chg_usr][Start]
 							pstmt.setString(5, chgUser);
 							//Modified by Anjali R. [31/12/2018][To update chg_date,chg_term and chg_usr][End]
 
@@ -538,10 +569,12 @@ public class LveEncArrCanc extends ActionHandlerEJB  implements LveEncArrCancLoc
 						System.out.println("count--["+count+"]");
 						if(count > 0)
 						{
+							//Modified by Anjaili R. on [19/07/2019][Start]
 							//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]
+							//errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "AR", "w_empleave_ench_arr", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
+							errString = admCommon.payarrToProcUpdation(prdCodePayroll, prdCodePayroll, empCode, empCode, "AR", "W_ATTD_PROC_NORULE", "", adCode,enchAmt*-1 , frDateStr, toDateStr, xtraParams, conn);
+							//Modified by Anjaili R. on [19/07/2019][End]
 							System.out.println("errString--["+errString+"]");
 
 							if(errString != null && errString.trim().length()>0)