Sarita : Committed on 05 JULY 19

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

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

@@ -80,7 +80,10 @@ public class EmployeeServicePrdAmdConf extends ActionHandlerEJB implements Emplo
 				isLocal = true;
 				conn.setAutoCommit(false);
 			}
-			sql = "SELECT EMP_CODE,CONFIRMED,AMENDMENT_NO,CANCELED,RETIREMENT_AGE_N,RETIREMENT_DATE_N FROM EMP_SERVICEPRD_AMD WHERE TRAN_ID = ?";
+			//Mdified by Sarita S. on [28/06/2019][Start]
+			//sql = "SELECT EMP_CODE,CONFIRMED,AMENDMENT_NO,CANCELED,RETIREMENT_AGE_N,RETIREMENT_DATE_N FROM EMP_SERVICEPRD_AMD WHERE TRAN_ID = ?";
+			sql = "SELECT EMP_CODE,CONFIRMED,AMENDMENT_NO,CANCELLED,RETIREMENT_AGE_N,RETIREMENT_DATE_N 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();
@@ -89,7 +92,10 @@ public class EmployeeServicePrdAmdConf extends ActionHandlerEJB implements Emplo
 				empCode = checkNull(rs.getString("EMP_CODE"));
 				confirmed = checkNull(rs.getString("CONFIRMED"));
 				amdNo = rs.getInt("AMENDMENT_NO");
-				cancelled = checkNull(rs.getString("CANCELED"));
+				//Mdified by Sarita S. on [28/06/2019][Start]
+				//cancelled = checkNull(rs.getString("CANCELED"));
+				cancelled = checkNull(rs.getString("CANCELLED"));
+				//Mdified by Sarita S. on [28/06/2019][End]
 				retAgeN = rs.getInt("RETIREMENT_AGE_N");
 				retDateN = rs.getTimestamp("RETIREMENT_DATE_N");
 			}	
@@ -152,8 +158,10 @@ public class EmployeeServicePrdAmdConf extends ActionHandlerEJB implements Emplo
 					return errString;
 				}
 				
-				
-				sql = "SELECT COUNT(*) as count FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND TRAN_ID <> ? AND CONFIRMED = 'N' AND AMENDMENT_NO < ? AND CANCELED = 'N'";
+				//Mdified by Sarita S. on [28/06/2019][Start]
+				//sql = "SELECT COUNT(*) as count FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND TRAN_ID <> ? AND CONFIRMED = 'N' AND AMENDMENT_NO < ? AND CANCELED = 'N'";
+				sql = "SELECT COUNT(*) as count FROM EMP_SERVICEPRD_AMD WHERE EMP_CODE = ? AND TRAN_ID <> ? AND CONFIRMED = 'N' AND AMENDMENT_NO < ? AND CANCELLED = 'N'";
+				//Mdified by Sarita S. on [28/06/2019][End]
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, empCode);
 				pstmt.setString(2, tranId);