Sarita : Committed on 05 JULY 19

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

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

@@ -122,15 +122,20 @@ public class EmployeeServicePrdAmdCanc extends ActionHandlerEJB implements Emplo
 				errString = itmdbAccess.getErrorString("", "VTEMPSPA02", "", "", conn);//Employee will relieved soon.
 				return errString;
 			}
-			
-			sql = "select CANCELED,EMP_CODE,CONFIRMED,RETIREMENT_AGE_O,RETIREMENT_DATE_O,AMENDMENT_NO from EMP_SERVICEPRD_AMD WHERE TRAN_ID = ? ";
+			//Mdified by Sarita S. on [28/06/2019][Start]
+			//sql = "select CANCELED,EMP_CODE,CONFIRMED,RETIREMENT_AGE_O,RETIREMENT_DATE_O,AMENDMENT_NO from EMP_SERVICEPRD_AMD WHERE TRAN_ID = ? ";
+			sql = "select CANCELLED,EMP_CODE,CONFIRMED,RETIREMENT_AGE_O,RETIREMENT_DATE_O,AMENDMENT_NO from EMP_SERVICEPRD_AMD WHERE TRAN_ID = ? ";
+			//Mdified by Sarita S. on [28/06/2019][End]
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
 				empCode = rs.getString("EMP_CODE");
-				canceled = rs.getString("CANCELED");
+				//Mdified by Sarita S. on [28/06/2019][Start]
+				//canceled = rs.getString("CANCELED");
+				canceled = rs.getString("CANCELLED");
+				//Mdified by Sarita S. on [28/06/2019][End]
 				confirmed = rs.getString("CONFIRMED");
 				retAgeO = rs.getInt("RETIREMENT_AGE_O");
 				retDateO = rs.getTimestamp("RETIREMENT_DATE_O");
@@ -155,7 +160,10 @@ public class EmployeeServicePrdAmdCanc extends ActionHandlerEJB implements Emplo
 			
 			if("N".equalsIgnoreCase(confirmed))
 			{
-				sql = "UPDATE EMP_SERVICEPRD_AMD set CANCELED = 'Y',CANC_DATE = ?,EMP_CODE__CANC = ? WHERE TRAN_ID = ? AND AMENDMENT_NO = ?";
+				//Mdified by Sarita S. on [28/06/2019][Start]
+				//sql = "UPDATE EMP_SERVICEPRD_AMD set CANCELED = 'Y',CANC_DATE = ?,EMP_CODE__CANC = ? WHERE TRAN_ID = ? AND AMENDMENT_NO = ?";
+				sql = "UPDATE EMP_SERVICEPRD_AMD set CANCELLED = 'Y',CANC_DATE = ?,EMP_CODE__CANC = ? WHERE TRAN_ID = ? AND AMENDMENT_NO = ?";
+				//Mdified by Sarita S. on [28/06/2019][End]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
 				pstmt.setString(2,loginEmpCode);
@@ -172,7 +180,10 @@ public class EmployeeServicePrdAmdCanc extends ActionHandlerEJB implements Emplo
 			else if ("Y".equalsIgnoreCase(confirmed))
 			{
 				System.out.println("2656568---["+cancelCnt+"]");
-				sql = "SELECT MAX(AMENDMENT_NO) AS AMDNO FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND CANCELED NOT IN ('Y') ";
+				//Mdified by Sarita S. on [28/06/2019][Start]
+				//sql = "SELECT MAX(AMENDMENT_NO) AS AMDNO FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND CANCELED NOT IN ('Y') ";CANCELLED
+				sql = "SELECT MAX(AMENDMENT_NO) AS AMDNO FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND CANCELLED NOT IN ('Y') ";
+				//Mdified by Sarita S. on [28/06/2019][End]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, empCode);
 				rs = pstmt.executeQuery();
@@ -195,7 +206,10 @@ public class EmployeeServicePrdAmdCanc extends ActionHandlerEJB implements Emplo
 				if(amendNoMax == amendNO) 
 				{
 					System.out.println("Success");
-					sql = "UPDATE EMP_SERVICEPRD_AMD set CANCELED = 'Y',CANC_DATE = ?,EMP_CODE__CANC = ? WHERE TRAN_ID = ? AND AMENDMENT_NO = ?";
+					//Mdified by Sarita S. on [28/06/2019][Start]
+					//sql = "UPDATE EMP_SERVICEPRD_AMD set CANCELED = 'Y',CANC_DATE = ?,EMP_CODE__CANC = ? WHERE TRAN_ID = ? AND AMENDMENT_NO = ?";
+					sql = "UPDATE EMP_SERVICEPRD_AMD set CANCELLED = 'Y',CANC_DATE = ?,EMP_CODE__CANC = ? WHERE TRAN_ID = ? AND AMENDMENT_NO = ?";
+					//Mdified by Sarita S. on [28/06/2019][End]
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
 					pstmt.setString(2,loginEmpCode);