* Poonam B changes done on Employeewise Paystructure obj_name : emp_ad

EmpAdPrs.java
EmployeeAdIC.java
EmployeeAdICRemote.java
w_emp_ad.sql
d_emp_allwdedn_brow.srd
d_emp_allwdedn_edit.srd


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

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

@@ -4,36 +4,40 @@
 
 package ibase.webitm.ejb.adm;
 import java.rmi.RemoteException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
-import java.sql.*;
-import javax.ejb.*;
-import org.w3c.dom.*;
-import ibase.webitm.utility.ITMException;
-import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
-import javax.ejb.Stateless; // added for ejb3
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
-@Stateless // added for ejb3
+import ibase.utility.E12GenericUtility;
+import ibase.webitm.ejb.ITMDBAccessEJB;
+import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.ITMException;
 
+//Modified by Poonam Bhosale on [27/06/2019][Start]
+//@Stateless // added for ejb3
+//Modified by Poonam Bhosale on [27/06/2019][End]
 public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemote	// SessionBean
 {
 	/*
 	public void ejbCreate() throws RemoteException, CreateException 
 	{
 	}
-
 	public void ejbRemove()
 	{
 	}
-
 	public void ejbActivate() 
 	{
 	}
-
 	public void ejbPassivate() 
 	{
 	}*/
-
+	
 	public String preSaveRec() throws RemoteException,ITMException
 	{
 		return "";
@@ -48,7 +52,10 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 		{
 			if (xmlString1 != null && xmlString1.trim().length() > 0)
 			{
-				dom = GenericUtility.getInstance().parseString(xmlString1);
+				//Modified by Poonam Bhosale on [27/06/2019][Start]
+				//dom = GenericUtility.getInstance().parseString(xmlString1);
+				dom = parseString(xmlString1);
+				//Modified by Poonam Bhosale on [27/06/2019][End]
 				retString = executepreSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
 			}			
 		}
@@ -66,18 +73,36 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 		Statement stmt = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		String empCode = "", adCode = "", effDate = "", expDate = "", periodFrom = "", periodTo = "";
-		String sqlStr = "", amt = "", keyString = "", errorCode = "";
-		String updateStatus = "", userId = "", retString = "";
-		double originalAmt = 0d, amount = 0d;
+		String empCode = "";
+		String adCode = "";
+		String effDate = "";
+		String expDate = "";
+		String periodFrom = "";
+		String periodTo = "";
+		String sqlStr = "";
+		String amt = "";
+		String keyString = "";
+		String errorCode = "";
+		String updateStatus = "";
+		String userId = "";
+		String retString = "";
+		double originalAmt = 0d;
+		double amount = 0d;
 		boolean empStatus = false;
 		int count = 0;
 		java.sql.Timestamp effectiveDate = null, expiryDate = null;
 		Node currDetail = null;
+		//Modified by Poonam Bhosale on [27/06/2019][Start]
+		ITMDBAccessEJB itmdbAccessEJB= new ITMDBAccessEJB();
+		//Modified by Poonam Bhosale on [27/06/2019][End]
+
 		try
 		{
 			conn.setAutoCommit(false);
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			//Modified by Poonam Bhosale on [27/06/2019][Start]
+			//GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility= new E12GenericUtility();
+			//Modified by Poonam Bhosale on [27/06/2019][End]
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
 			AdmCommon admCommon = new AdmCommon();
 			System.out.println("dom.............:: "+ dom);
@@ -87,15 +112,15 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 			System.out.println("updateStatus......:: "+ updateStatus);
 			if (currDetail != null)
 			{
-				
+
 				/*Modified by Anjali Rawankar on [10/04/2017][Start]
 				 *[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
 				 */
 				//if(updateStatus.equalsIgnoreCase("A") || updateStatus.equalsIgnoreCase("E"))
 				if(updateStatus.equalsIgnoreCase("A") || updateStatus.equalsIgnoreCase("E") || updateStatus.equalsIgnoreCase("N") || updateStatus.equalsIgnoreCase("O"))
-				/*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
-				 * Modified by Anjali Rawankar on [10/04/2017][End]
-				 */
+					/*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
+					 * Modified by Anjali Rawankar on [10/04/2017][End]
+					 */
 				{
 					empStatus = true; // Added by Piyush on 30/06/2015[To make implication same as ITM]
 					/*Modified by Anjali Rawankar on [10/04/2017][Start]
@@ -103,9 +128,9 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 					 */
 					//if(updateStatus.equals("A"))
 					if(updateStatus.equals("A") || updateStatus.equals("N"))
-					/*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
-					 * Modified by Anjali Rawankar on [10/04/2017][End]
-					 */
+						/*[Purpose : while upload excel file update status 'N' for add and 'O' for edit is coming in new framework.Changes done against issue reported by Jimil from fortune and as discussed with Gulzar.
+						 * Modified by Anjali Rawankar on [10/04/2017][End]
+						 */
 					{
 						empCode = genericUtility.getColumnValueFromNode("emp_code",currDetail);
 						adCode	= genericUtility.getColumnValueFromNode("ad_code",currDetail);
@@ -174,7 +199,10 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 						if (errorCode.trim().length() > 0)
 						{
 							conn.rollback();
-							retString = getErrorString("",errorCode,userId);
+							//
+							//retString = getErrorString("",errorCode,userId);
+							retString = itmdbAccessEJB.getErrorString("", errorCode, userId, "", conn);
+							//
 							System.out.println("Ret String: " + retString);
 						}
 						else if (errorCode.trim().length() == 0)
@@ -199,7 +227,10 @@ public class EmpAdPrs extends ValidatorEJB implements EmpAdPrsLocal,EmpAdPrsRemo
 					if (count != 0)
 					{
 						errorCode = "VTPAYFND";
-						retString = getErrorString("",errorCode,userId);
+						///Modified by Poonam Bhosale on [27/06/2019][Start]
+						//retString = getErrorString("",errorCode,userId);
+						retString = itmdbAccessEJB.getErrorString("", errorCode, userId, "", conn);
+						///Modified by Poonam Bhosale on [27/06/2019][End]
 						System.out.println("Ret String: " + retString);
 					}
 				}

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

 package ibase.webitm.ejb.adm;
 
 import java.rmi.RemoteException;
-import java.sql.Connection;
 
 import javax.ejb.Remote;