Commit 486223f0 authored by jshaikh's avatar jshaikh

Changes made in employeeEJB component

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204412 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e7100ec9
...@@ -4,9 +4,15 @@ ...@@ -4,9 +4,15 @@
//Component : Employee Master //Component : Employee Master
//Date: 26/MAY/15 //Date: 26/MAY/15
package ibase.webitm.ejb.adm; package ibase.webitm.ejb.adm;
//import ibase.system.config.*;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.*;
//import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
//import jxl.write.DateTime;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
...@@ -21,7 +27,7 @@ import java.util.Calendar; ...@@ -21,7 +27,7 @@ import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import javax.ejb.Stateless; //import javax.ejb.Stateless;
import org.w3c.dom.CDATASection; import org.w3c.dom.CDATASection;
//import org.dom4j.util.IndexedElement; //import org.dom4j.util.IndexedElement;
...@@ -30,9 +36,6 @@ import org.w3c.dom.NamedNodeMap; ...@@ -30,9 +36,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
//import ibase.system.config.*;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
//import bsh.util.Util; //import bsh.util.Util;
//import ibase.system.config.ConnDriver; //import ibase.system.config.ConnDriver;
//import ibase.utility.E12GenericUtility; //import ibase.utility.E12GenericUtility;
...@@ -40,18 +43,17 @@ import ibase.webitm.ejb.ValidatorEJB; ...@@ -40,18 +43,17 @@ import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.sys.UtilMethods; import ibase.webitm.ejb.sys.UtilMethods;
//import ibase.webitm.utility.GenericUtility; //import ibase.webitm.utility.GenericUtility;
//import ibase.webitm.utility.ITMException; //import ibase.webitm.utility.ITMException;
//import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
//import jxl.write.DateTime;
//import com.sun.org.apache.xalan.internal.xsltc.compiler.Pattern; //import com.sun.org.apache.xalan.internal.xsltc.compiler.Pattern;
@Stateless //@Stateless
public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,EmployeeEJBRemote public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,EmployeeEJBRemote
{ {
E12GenericUtility genericUtility = new E12GenericUtility();//Modified by Rohini T. E12GenericUtility genericUtility = new E12GenericUtility();//Modified by Rohini T.
UtilMethods utilMethod = new UtilMethods(); ITMDBAccessEJB itmdbAccessEJB = new ITMDBAccessEJB();// Added By Poonam B .
UtilMethods utilMethod = new UtilMethods();// Added By Poonam B .
String formNameGlob = ""; //Added By Poonam B .
// Code for Validation // Code for Validation
public String wfValData() throws RemoteException, ITMException public String wfValData() throws RemoteException, ITMException
{ {
...@@ -94,37 +96,39 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -94,37 +96,39 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
System.out.println ("Exception: EmployeeEJB: wfValData(String xmlString): " + e.getMessage() + ":"); System.out.println ("Exception: EmployeeEJB: wfValData(String xmlString): " + e.getMessage() + ":");
errString = genericUtility.createErrorString(e); errString = genericUtility.createErrorString(e);
e.printStackTrace(); e.printStackTrace();
// Added By Poonam[09/07/2019].start
throw new ITMException(e);
//Added By Poonam[09/07/2019].end
} }
System.out.println ("Returning from EmployeeEJB wfValData"); System.out.println ("Returning from EmployeeEJB wfValData");
return (errString); return (errString);
} }
public String wfValData(Document dom, Document dom1,Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException public String wfValData(Document dom, Document dom1,Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
{ {
NodeList parentNodeList = null; NodeList parentNodeList = null;
NodeList childNodeList = null; NodeList childNodeList = null;
Node parentNode = null; Node parentNode = null;
Node childNode = null; Node childNode = null;
Connection conn = null;
int ctr=0,currentFormNo =0,childNodeListLength =0,cnt =0; int ctr=0,currentFormNo =0,childNodeListLength =0,cnt =0;
String cctrCodeSal=""; String cctrCodeSal="";
String childNodeName = null,childNodeValue = null; String childNodeName = null,childNodeValue = null;
String errString = ""; String errString = "";
String errCode = "",workLocCode="",parentDept=""; String errCode = "",workLocCode="",parentDept="";
Connection conn = null;
String userId = ""; String userId = "";
String stanCode=""; String stanCode="";
String loginSite = ""; String msgType = "";
//String loginSite = "";
String bankCode="",bankAcct="",funcGroup=""; String bankCode="",bankAcct="",funcGroup="";
String payableBank="" , year="",duration=""; String payableBank="" , year="",duration="";
String acctCodeSal="",amount="",handCtgr=""; String acctCodeSal="",amount="",handCtgr="";
String nationality="",empCodeHOD="" , trainCode="",empMname=""; String nationality="",empCodeHOD="" , trainCode="",empMname="";
String payMode="",graDate="" ,printSeq="",empCodeLink=""; String payMode="",graDate="" ,printSeq="",empCodeLink="";
String projCode="",startDate="",siteCodePay="",perState=""; String projCode="",startDate="",siteCodePay="",perState="";
String isTemp="",workShift="",patternCode="",curState=""; String isTemp="",workShift="",patternCode="",curState="",ls_dept_code="",ls_pos_code="";
String contactCode="",empLname = "",empFname = "",sex = ""; String contactCode="",empLname = "",empFname = "",empLnameLong="",empFnameLong="";
String relieveDateStr ="",deptCode ="",cadreCode ="",gradeCode =""; String relieveDateStr ="",deptCode ="",cadreCode ="",gradeCode ="",countCodeWork="";
String designCode ="",empSite ="",workSite ="",conState="",currCode=""; String designCode ="",empSite ="",workSite ="",conState="",currCode="";
String empCode ="",paySite ="",reportTo ="", stanCodeHq ="",reportToAdmin =""; String empCode ="",paySite ="",reportTo ="", stanCodeHq ="",reportToAdmin ="";
String dateJoinStr ="",status ="",emailIdOff = "",language="",keyFlag=""; String dateJoinStr ="",status ="",emailIdOff = "",language="",keyFlag="";
...@@ -136,7 +140,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -136,7 +140,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
java.util.Date joinDate = null; java.util.Date joinDate = null;
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
ResultSet rs=null; ResultSet rs=null;
String msgType = "";
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>(); ArrayList<String> errFields = new ArrayList<String>();
try try
...@@ -147,16 +150,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -147,16 +150,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
conn = getConnection(); conn = getConnection();
//Modified by Anjali R. on [30/05/2019][End] //Modified by Anjali R. on [30/05/2019][End]
userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); //loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//Commented by Poonam B. on [18/07/2019][Start]
// Modified by Yashwant on 26/06/2019.Start
ITMDBAccessEJB itmdbAccessEJB=new ITMDBAccessEJB();
// Modified by Yashwant on 26/06/2019.End
//Modified by Yashwant on 26/06/2019.Start
E12GenericUtility genericUtility = new E12GenericUtility();
//GenericUtility genericUtility = GenericUtility.getInstance(); //GenericUtility genericUtility = GenericUtility.getInstance();
//Modified by Yashwant on 26/06/2019.End //Commented by Poonam B. on [18/07/2019][End]
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
SimpleDateFormat dbsdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat dbsdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
if(editFlag == null || editFlag.trim().length() == 0) if(editFlag == null || editFlag.trim().length() == 0)
...@@ -184,23 +181,45 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -184,23 +181,45 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
childNodeList = parentNode.getChildNodes(); childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength(); childNodeListLength = childNodeList.getLength();
System.out.println("child Node List Length::::::"+childNodeListLength); System.out.println("child Node List Length::::::"+childNodeListLength);
//Added By Poonam B [30-07-2019][START]
System.out.println("formNameGlob " + formNameGlob);
if(currentFormNo == 1 && "Header".equals(formNameGlob))
{
for(ctr = 0; ctr < childNodeListLength; ctr++) for(ctr = 0; ctr < childNodeListLength; ctr++)
{ {
childNode = childNodeList.item(ctr); childNode = childNodeList.item(ctr);
System.out.println("childNode"+childNode); System.out.println("childNode"+childNode);
if( childNode.getNodeType() != Node.ELEMENT_NODE ) if( childNode.getNodeType() != Node.ELEMENT_NODE )
{ {
continue; continue;
} }
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
if(childNode.getFirstChild()!= null) if(childNode.getFirstChild()!= null)
{ {
childNodeValue = childNode.getFirstChild().getNodeValue(); childNodeValue = childNode.getFirstChild().getNodeValue();
} }
if(childNodeName.equalsIgnoreCase("emp_code"))
{
}
}
}
else
{
//Added By Poonam B [30-07-2019][END]
for(ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = childNodeList.item(ctr);
System.out.println("childNode"+childNode);
if( childNode.getNodeType() != Node.ELEMENT_NODE )
{
continue;
}
childNodeName = childNode.getNodeName();
if(childNode.getFirstChild()!= null)
{
childNodeValue = childNode.getFirstChild().getNodeValue();
}
if(childNodeName.equalsIgnoreCase("emp_code")) if(childNodeName.equalsIgnoreCase("emp_code"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
...@@ -209,12 +228,17 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -209,12 +228,17 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
System.out.println("EMPcode::::::["+empCode+"]"); System.out.println("EMPcode::::::["+empCode+"]");
String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW='w_emp_master'"; //String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW='w_emp_master'";
//String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_complete'";//Modified By Poonam B on[25-07-2019]
String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_temp'";//Modified By Poonam B on[26-07-2019]
pstmt=conn.prepareStatement(sqlKey); pstmt=conn.prepareStatement(sqlKey);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
keyFlag=rs.getString("KEY_FLAG"); //Modified by Poonam B on 12/07/2019[START].To add checkNull method
//keyFlag=rs.getString("KEY_FLAG");
keyFlag=checkNull(rs.getString("KEY_FLAG"));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
System.out.println("KEY FLAG VALUE:::::::::"+keyFlag); System.out.println("KEY FLAG VALUE:::::::::"+keyFlag);
System.out.println("editFlg:::::::::"+editFlg); System.out.println("editFlg:::::::::"+editFlg);
if(editFlg.equalsIgnoreCase("A")) if(editFlg.equalsIgnoreCase("A"))
...@@ -234,6 +258,48 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -234,6 +258,48 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
else else
{ {
cnt = isValueExist("employee","emp_code",empCode, conn);
close(pstmt,rs);
if(cnt > 0)
{
errList.add("VMDUPL1");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMDUPL1");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
}
// Added By Poonam B on[09/07/2019].start
if((msgType == null || msgType.trim().length() == 0) && (empCode != null && empCode.trim().length() > 0))
{
cnt = 0;
String mval1 = empCode.replace("'","$");
String sql = "select DDF_CHK_SPLCHAR(?) as cnt from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval1);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt("cnt");
}
//close(pstmt,rs);
if(cnt > 0)
{
errList.add("VMINVLDCHR");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMINVLDCHR");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
else
{
cnt=0;
cnt = isValueExist("employee","emp_code",empCode, conn); cnt = isValueExist("employee","emp_code",empCode, conn);
if(cnt > 0) if(cnt > 0)
{ {
...@@ -245,13 +311,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -245,13 +311,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break; break;
} }
} }
//close(pstmt,rs);
} }
} }
// Added By Poonam B on[09/07/2019].END
} }
} }
close(pstmt, rs); close(pstmt, rs);
} }
else if(childNodeName.equalsIgnoreCase("emp_fname")) else if(childNodeName.equalsIgnoreCase("emp_fname"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
...@@ -272,7 +339,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -272,7 +339,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("emp_mname")) /*else if(childNodeName.equalsIgnoreCase("emp_mname"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
...@@ -280,8 +347,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -280,8 +347,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
empMname = checkNull(genericUtility.getColumnValue("emp_mname", dom)); empMname = checkNull(genericUtility.getColumnValue("emp_mname", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
//Modified condition by Jaffar S. on 26/07/19 if(empMname == null)
//if(empMname == null) {
//Added by Poonam B on 12/07/2019[START].to validate employee mName
if(empMname == null || empMname.trim().length() == 0) if(empMname == null || empMname.trim().length() == 0)
{ {
errList.add("VEEMP5"); errList.add("VEEMP5");
...@@ -292,7 +361,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -292,7 +361,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break; break;
} }
} }
} }*/
else if(childNodeName.equalsIgnoreCase("emp_lname")) else if(childNodeName.equalsIgnoreCase("emp_lname"))
{ {
...@@ -302,7 +371,24 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -302,7 +371,24 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
empLname = checkNull(genericUtility.getColumnValue("emp_lname", dom)); empLname = checkNull(genericUtility.getColumnValue("emp_lname", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(empLname == null || empLname.trim().length() == 0) if(empLname == null || (empLname.trim().length() == 0))
{
errList.add("VEEMP3");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VEEMP3");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
// Added By Poonam B on[09/07/2019].start
else if(childNodeName.trim().equalsIgnoreCase("emp_lname_long"))
{
System.out.println(" Validaion for field "+childNodeName);
empLnameLong =checkNull( genericUtility.getColumnValue("emp_lname_long", dom));
if(empLnameLong == null || empLnameLong.trim().length() == 0)
{ {
errList.add("VEEMP3"); errList.add("VEEMP3");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -313,6 +399,23 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -313,6 +399,23 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("emp_fname_long"))
{
System.out.println(" Validaion for field "+childNodeName);
empFnameLong =checkNull( genericUtility.getColumnValue("emp_fname_long", dom));
if(empFnameLong == null || empFnameLong.trim().length() == 0)
{
errList.add("VEEMP4");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VEEMP4");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
// Added By Poonam B on[09/07/2019].end
else if(childNodeName.equalsIgnoreCase("contact_code")) else if(childNodeName.equalsIgnoreCase("contact_code"))
{ {
...@@ -384,9 +487,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -384,9 +487,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("dept_code")) else if(childNodeName.equalsIgnoreCase("dept_code"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
...@@ -397,9 +497,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -397,9 +497,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
cnt = isValueExist("department","dept_code",deptCode, conn); cnt = isValueExist("department","dept_code",deptCode, conn);
if(cnt == 0) if(cnt == 0)
{ {
errList.add("VMDEP1"); errList.add("VTDEPT1");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMDEP1"); msgType = errorType(conn, "VTDEPT1");
if (msgType.equalsIgnoreCase("E")) if (msgType.equalsIgnoreCase("E"))
{ {
break; break;
...@@ -419,8 +519,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -419,8 +519,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
} }
//Modified by Ahmed on 22/AUG/2016 [A16ESUN005] [To validate func_group from busi_functions table, emp_code__funchead from employee table and bu_code from business_units table][start] //Modified by Ahmed on 22/AUG/2016 [A16ESUN005] [To validate func_group from busi_functions table, emp_code__funchead from employee table and bu_code from business_units table][start]
else if(childNodeName.equalsIgnoreCase("func_group")) else if(childNodeName.equalsIgnoreCase("func_group"))
...@@ -508,7 +606,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -508,7 +606,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
relieveDateTS = rs.getTimestamp("relieve_date"); relieveDateTS = rs.getTimestamp("relieve_date");
} }
close(pstmt,rs); //close(pstmt,rs);
if(relieveDateTS != null) if(relieveDateTS != null)
{ {
errList.add("VMEMPFUHD3"); errList.add("VMEMPFUHD3");
...@@ -561,8 +659,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -561,8 +659,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//gradeCode = genericUtility.getColumnValue("grade_code", dom); //gradeCode = genericUtility.getColumnValue("grade_code", dom);
gradeCode = checkNull(genericUtility.getColumnValue("grade_code", dom)); gradeCode = checkNull(genericUtility.getColumnValue("grade_code", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(gradeCode != null && gradeCode.trim().length() > 0) //if(gradeCode != null && gradeCode.trim().length() > 0)
{ //{
cnt = isValueExist("grade","grade_code",gradeCode, conn); cnt = isValueExist("grade","grade_code",gradeCode, conn);
if(cnt == 0) if(cnt == 0)
{ {
...@@ -575,7 +673,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -575,7 +673,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
}
else if(childNodeName.equalsIgnoreCase("cadre_code")) else if(childNodeName.equalsIgnoreCase("cadre_code"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
...@@ -634,7 +731,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -634,7 +731,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
else if (designCode == null || designCode.trim().length() == 0) else if (designCode == null || designCode.trim().length() == 0)
{ {
errList.add("VMDESIGN2"); errList.add("VMDESIGN2");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMDESIGN2"); msgType = errorType(conn, "VMDESIGN2");
...@@ -647,12 +743,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -647,12 +743,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("report_to")) else if(childNodeName.equalsIgnoreCase("report_to"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
reportTo = checkNull(genericUtility.getColumnValue("report_to", dom)); //reportTo =genericUtility.getColumnValue("report_to", dom);
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
//reportTo = genericUtility.getColumnValue("report_to", dom);
//empCode = genericUtility.getColumnValue("emp_code", dom); //empCode = genericUtility.getColumnValue("emp_code", dom);
// Modified by Yashwant on 26/06/2019.End reportTo = checkNull(genericUtility.getColumnValue("report_to", dom));
empCode = checkNull( genericUtility.getColumnValue("emp_code", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(reportTo != null && reportTo.trim().length() > 0) if(reportTo != null && reportTo.trim().length() > 0)
{ {
cnt = isValueExist("employee","emp_code",reportTo, conn); cnt = isValueExist("employee","emp_code",reportTo, conn);
...@@ -695,17 +791,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -695,17 +791,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("report_to__admin")) else if(childNodeName.equalsIgnoreCase("report_to__admin"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
reportToAdmin = checkNull(genericUtility.getColumnValue("report_to__admin", dom)); //reportToAdmin =genericUtility.getColumnValue("report_to__admin", dom);
//empCode =genericUtility.getColumnValue("emp_code", dom);
reportToAdmin =checkNull( genericUtility.getColumnValue("report_to__admin", dom));
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
//reportToAdmin = genericUtility.getColumnValue("report_to__admin", dom); //Modified by Poonam B on 12/07/2019[START].To add checkNull method
//empCode = genericUtility.getColumnValue("emp_code", dom);
// Modified by Yashwant on 26/06/2019.End
if(reportToAdmin != null && reportToAdmin.trim().length() > 0) if(reportToAdmin != null && reportToAdmin.trim().length() > 0)
{ {
cnt = isValueExist("employee","emp_code",reportToAdmin, conn); cnt = isValueExist("employee","emp_code",reportToAdmin, conn);
...@@ -749,8 +843,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -749,8 +843,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
empSite = checkNull(genericUtility.getColumnValue("emp_site", dom));
//empSite = genericUtility.getColumnValue("emp_site", dom); //empSite = genericUtility.getColumnValue("emp_site", dom);
empSite = checkNull(genericUtility.getColumnValue("emp_site", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(empSite != null && empSite.trim().length() > 0) if(empSite != null && empSite.trim().length() > 0)
{ {
...@@ -770,10 +864,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -770,10 +864,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("work_site")) else if(childNodeName.equalsIgnoreCase("work_site"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
workSite = checkNull(genericUtility.getColumnValue("work_site", dom)); //workSite =genericUtility.getColumnValue("work_site", dom);
//workSite = genericUtility.getColumnValue("work_site", dom); workSite =checkNull( genericUtility.getColumnValue("work_site", dom));
// Modified by Yashwant on 26/06/2019.End //Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(workSite != null && workSite.trim().length() > 0) if(workSite != null && workSite.trim().length() > 0)
{ {
cnt = isValueExist("site","site_code",workSite, conn); cnt = isValueExist("site","site_code",workSite, conn);
...@@ -792,10 +886,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -792,10 +886,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("pay_site")) else if(childNodeName.equalsIgnoreCase("pay_site"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
paySite = checkNull(genericUtility.getColumnValue("pay_site", dom)); //paySite =genericUtility.getColumnValue("pay_site", dom);
//paySite = genericUtility.getColumnValue("pay_site", dom); paySite =checkNull( genericUtility.getColumnValue("pay_site", dom));
// Modified by Yashwant on 26/06/2019.End //Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(paySite != null && paySite.trim().length() > 0) if(paySite != null && paySite.trim().length() > 0)
{ {
cnt = isValueExist("site","site_code",paySite, conn); cnt = isValueExist("site","site_code",paySite, conn);
...@@ -811,20 +905,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -811,20 +905,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("date_join")) else if(childNodeName.equalsIgnoreCase("date_join"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
//dateJoinStr =genericUtility.getColumnValue("date_join", dom);
dateJoinStr = checkNull(genericUtility.getColumnValue("date_join", dom)); dateJoinStr = checkNull(genericUtility.getColumnValue("date_join", dom));
//dateJoinStr = genericUtility.getColumnValue("date_join", dom); //Modified by Poonam B on 12/07/2019[END].To add checkNull method
// Modified by Yashwant on 26/06/2019.End
System.out.println(" dateJoinStr................ "+dateJoinStr); System.out.println(" dateJoinStr................ "+dateJoinStr);
//Modified condition by Jaffar S. on 26/07/19 if( dateJoinStr == null )
//if( dateJoinStr == null )
if(dateJoinStr == null || dateJoinStr.trim().length() == 0)
{ {
errList.add("VMJOIN"); errList.add("VMJOIN");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -834,15 +923,41 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -834,15 +923,41 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break; break;
} }
} }
//Added by Poonam B on[10.07.2019].start
String posCode =checkNull(genericUtility.getColumnValue("pos_code",dom));
empCode = checkNull(genericUtility.getColumnValue("emp_code",dom));
deptCode = checkNull(genericUtility.getColumnValue("dept_code",dom));
System.out.println(" emp_code................ "+empCode);
//Added by Poonam B on[16.07.2019].start.to check date format
if(dateJoinStr != null && dateJoinStr.trim().length() > 0)
{
joinDate = sdf.parse(dateJoinStr);
}
//Added by Poonam B on[16.07.2019].end.to check date format
String sql="select dept_code, pos_code from employee where emp_code = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, empCode);
rs=pstmt.executeQuery();
while(rs.next())
{
//Modified by Poonam B on[25.07.2019][Start]
/*ls_dept_code=checkNull(rs.getString("ls_dept_code"));
ls_pos_code=checkNull(rs.getString("ls_pos_code"));*/
ls_dept_code=checkNull(rs.getString("dept_code"));
ls_pos_code=checkNull(rs.getString("pos_code"));
//Modified by Poonam B on[25.07.2019][END]
}
close(pstmt,rs);
errString = validatePosition(empCode , ls_pos_code , ls_dept_code , joinDate, conn);
//Added by Poonam B on[10.07.2019].end
} }
else if(childNodeName.equalsIgnoreCase("stan_code__hq")) else if(childNodeName.equalsIgnoreCase("stan_code__hq"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
stanCodeHq = checkNull(genericUtility.getColumnValue("stan_code__hq", dom)); //stanCodeHq =genericUtility.getColumnValue("stan_code__hq", dom);
//stanCodeHq = genericUtility.getColumnValue("stan_code__hq", dom); stanCodeHq =checkNull(genericUtility.getColumnValue("stan_code__hq", dom));
// Modified by Yashwant on 26/06/2019.End //Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(stanCodeHq != null && stanCodeHq.trim().length() > 0) if(stanCodeHq != null && stanCodeHq.trim().length() > 0)
{ {
cnt = isValueExist("station","stan_code",stanCodeHq, conn); cnt = isValueExist("station","stan_code",stanCodeHq, conn);
...@@ -858,19 +973,16 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -858,19 +973,16 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("bank_code")) else if(childNodeName.equalsIgnoreCase("bank_code"))
{ {
System.out.println(" Validaion for field "+childNodeName); System.out.println(" Validaion for field "+childNodeName);
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
bankCode=checkNull(genericUtility.getColumnValue("bank_code", dom));
//bankCode=genericUtility.getColumnValue("bank_code", dom); //bankCode=genericUtility.getColumnValue("bank_code", dom);
// Modified by Yashwant on 26/06/2019.End bankCode=checkNull(genericUtility.getColumnValue("bank_code", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(bankCode != null && bankCode.trim().length() > 0) if(bankCode != null && bankCode.trim().length() > 0)
{ {
String sql="Select count(*) as cnt from bank where bank_code =?"; String sql="Select count(*) as cnt from bank where bank_code = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, bankCode); pstmt.setString(1, bankCode);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
...@@ -891,12 +1003,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -891,12 +1003,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
else else
{ {
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
stanCode=checkNull(genericUtility.getColumnValue("stan_code", dom));
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
//stanCode=genericUtility.getColumnValue("stan_code", dom); //stanCode=genericUtility.getColumnValue("stan_code", dom);
//empCode=genericUtility.getColumnValue("emp_code", dom); //empCode=genericUtility.getColumnValue("emp_code", dom);
// Modified by Yashwant on 26/06/2019.End stanCode=checkNull(genericUtility.getColumnValue("stan_code", dom));
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(stanCode !=null && stanCode.trim().length() > 0) if(stanCode !=null && stanCode.trim().length() > 0)
{ {
String sqlsc="select count(*) as cnt from bank_stan_serv where bank_code = ? and stan_code = ?"; String sqlsc="select count(*) as cnt from bank_stan_serv where bank_code = ? and stan_code = ?";
...@@ -910,7 +1022,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -910,7 +1022,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
cnt=rs.getInt("cnt"); cnt=rs.getInt("cnt");
} }
close(pstmt,rs); close(pstmt,rs);
if(cnt==0) if(cnt == 0)
{ {
errList.add("VTBKSTAN"); errList.add("VTBKSTAN");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -922,13 +1034,13 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -922,13 +1034,13 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
else else
{ {
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
paySite=checkNull(genericUtility.getColumnValue("pay_site", dom));
//paySite=genericUtility.getColumnValue("pay_site", dom); //paySite=genericUtility.getColumnValue("pay_site", dom);
// Modified by Yashwant on 26/06/2019.End paySite=checkNull(genericUtility.getColumnValue("pay_site", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(paySite != null && paySite.trim().length() > 0) if(paySite != null && paySite.trim().length() > 0)
{ {
String sqlPs="select count(*) as cnt from bank where bank_code = ? " String sqlPs = "select count(*) as cnt from bank where bank_code = ? "
+ "and site_code = (select site_code__acct from site where site_code = ?) "; + "and site_code = (select site_code__acct from site where site_code = ?) ";
pstmt=conn.prepareStatement(sqlPs); pstmt=conn.prepareStatement(sqlPs);
pstmt.setString(1, bankCode); pstmt.setString(1, bankCode);
...@@ -985,10 +1097,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -985,10 +1097,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("stan_code")) else if(childNodeName.equalsIgnoreCase("stan_code"))
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
stanCode=checkNull(genericUtility.getColumnValue("stan_code", dom));
//stanCode=genericUtility.getColumnValue("stan_code", dom); //stanCode=genericUtility.getColumnValue("stan_code", dom);
// Modified by Yashwant on 26/06/2019.End stanCode=checkNull(genericUtility.getColumnValue("stan_code", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(stanCode != null && stanCode.trim().length() > 0) if(stanCode != null && stanCode.trim().length() > 0)
{ {
...@@ -1006,10 +1118,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1006,10 +1118,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
else else
{ {
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull metho
payMode=checkNull(genericUtility.getColumnValue("pay_mode", dom));
//payMode=genericUtility.getColumnValue("pay_mode", dom); //payMode=genericUtility.getColumnValue("pay_mode", dom);
// Modified by Yashwant on 26/06/2019.End payMode=checkNull(genericUtility.getColumnValue("pay_mode", dom));
//Modified by Poonam B on 12/07/2019[START].To add checkNull method
if(payMode != null && payMode.trim().length() > 0) if(payMode != null && payMode.trim().length() > 0)
{ {
if(payMode.equals("D") || payMode.equals("T")) if(payMode.equals("D") || payMode.equals("T"))
...@@ -1031,15 +1143,17 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1031,15 +1143,17 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("proj_code")) else if(childNodeName.equalsIgnoreCase("proj_code"))
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
//projCode =genericUtility.getColumnValue("proj_code", dom);
projCode = checkNull(genericUtility.getColumnValue("proj_code", dom)); projCode = checkNull(genericUtility.getColumnValue("proj_code", dom));
//projCode = genericUtility.getColumnValue("proj_code", dom); //Modified by Poonam B on 12/07/2019[END].To add checkNull method
// Modified by Yashwant on 26/06/2019.End //Added by Poonam B on 12/07/2019[START].to check Project Code value
System.out.println("validaton for Project code"+projCode);
//Modified condition by Jaffar S. on 26/07/19 /*if(projCode != null)
//if(projCode != null) {*/
if(projCode != null && projCode.trim().length() > 0) if(projCode != null && projCode.length() > 0)
{ {
//Added by Poonam B on 12/07/2019[END].to check Project Code value
cnt = isValueExist("project","proj_code",projCode, conn); cnt = isValueExist("project","proj_code",projCode, conn);
if(cnt==0) if(cnt==0)
{ {
...@@ -1170,12 +1284,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1170,12 +1284,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("cur_state")) else if(childNodeName.equalsIgnoreCase("cur_state"))
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
curState=checkNull(genericUtility.getColumnValue("cur_state", dom));
//curState=genericUtility.getColumnValue("cur_state", dom); //curState=genericUtility.getColumnValue("cur_state", dom);
// Modified by Yashwant on 26/06/2019.End curState=checkNull(genericUtility.getColumnValue("cur_state", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
//Modified by Poonam B on 16/07/2019[Start].To avoid null value of cur_state
if(curState != null && curState.trim().length() > 0) if(curState != null && curState.trim().length() > 0)
{ {
//Modified by Poonam B on 16/07/2019[END].To avoid null value of cur_state
cnt=isValueExist("state","state_code",curState, conn); cnt=isValueExist("state","state_code",curState, conn);
if(cnt==0) if(cnt==0)
{ {
...@@ -1202,10 +1318,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1202,10 +1318,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("per_state")) else if(childNodeName.equalsIgnoreCase("per_state"))
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
perState=checkNull(genericUtility.getColumnValue("per_state", dom));
//perState=genericUtility.getColumnValue("per_state", dom); //perState=genericUtility.getColumnValue("per_state", dom);
// Modified by Yashwant on 26/06/2019.End perState=checkNull(genericUtility.getColumnValue("per_state", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
System.out.println("perState::::"+perState); System.out.println("perState::::"+perState);
if(perState != null && perState.trim().length() > 0) if(perState != null && perState.trim().length() > 0)
{ {
...@@ -1232,7 +1348,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1232,7 +1348,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
else if(childNodeName.equalsIgnoreCase("site_code__payment")) else if(childNodeName.equalsIgnoreCase("site_code__payment"))
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
...@@ -1351,10 +1466,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1351,10 +1466,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
cnt = 0; cnt = 0;
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
workSite=checkNull(genericUtility.getColumnValue("work_site", dom));
//empCode=genericUtility.getColumnValue("emp_code", dom); //empCode=genericUtility.getColumnValue("emp_code", dom);
//workSite=genericUtility.getColumnValue("work_site", dom); //workSite=genericUtility.getColumnValue("work_site", dom);
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
workSite=checkNull(genericUtility.getColumnValue("work_site", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
String sqlPc="select start_date as startdate from shift_pattern " String sqlPc="select start_date as startdate from shift_pattern "
+ "where site_code = ? and pattern_code = ?"; + "where site_code = ? and pattern_code = ?";
...@@ -1364,7 +1479,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1364,7 +1479,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
startDate=rs.getString("startdate"); //Modified by Poonam B on 12/07/2019[START].To add checkNull method
//startDate=rs.getString("startdate");
startDate=checkNull(rs.getString("startdate"));
//Modified by Poonam B on 12/07/2019[START].To add checkNull method
cnt = 1; cnt = 1;
} }
close(pstmt,rs); close(pstmt,rs);
...@@ -1390,8 +1508,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1390,8 +1508,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
else else
{
//Added by Poonam B on[16.07.2019].START.to check date format
//startDt =dbsdf.parse(startDate) ;
if(startDate!= null && startDate.trim().length() > 0)
{ {
startDt =dbsdf.parse(startDate) ; startDt =dbsdf.parse(startDate) ;
}
//Added by Poonam B on[16.07.2019].END.to check date format
if(startDt.after(currDate)) if(startDt.after(currDate))
{ {
errList.add("VTDTGTST"); errList.add("VTDTGTST");
...@@ -1408,18 +1532,18 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1408,18 +1532,18 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else if(childNodeName.equalsIgnoreCase("work_shift")) else if(childNodeName.equalsIgnoreCase("work_shift"))
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
workShift=checkNull(genericUtility.getColumnValue("work_shift", dom));
//workShift=genericUtility.getColumnValue("work_shift", dom); //workShift=genericUtility.getColumnValue("work_shift", dom);
// Modified by Yashwant on 26/06/2019.End workShift=checkNull(genericUtility.getColumnValue("work_shift", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(workShift != null && workShift.trim().length() > 0) if(workShift != null && workShift.trim().length() > 0)
{ {
// Modified by Yashwant on 26/06/2019.Start //Modified by Poonam B on 12/07/2019[START].To add checkNull method
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
workSite=checkNull(genericUtility.getColumnValue("work_site", dom));
//empCode=genericUtility.getColumnValue("emp_code", dom); //empCode=genericUtility.getColumnValue("emp_code", dom);
//workSite=genericUtility.getColumnValue("work_site", dom); //workSite=genericUtility.getColumnValue("work_site", dom);
// Modified by Yashwant on 26/06/2019.End empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
workSite=checkNull(genericUtility.getColumnValue("work_site", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
String sqlWs=" select count(*) as cnt from workshft where site_code = ? and shift = ?"; String sqlWs=" select count(*) as cnt from workshft where site_code = ? and shift = ?";
pstmt=conn.prepareStatement(sqlWs); pstmt=conn.prepareStatement(sqlWs);
pstmt.setString(1, workSite); pstmt.setString(1, workSite);
...@@ -1520,8 +1644,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1520,8 +1644,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
empCodeHOD = checkNull(genericUtility.getColumnValue("emp_code__hod", dom));
//empCodeHOD = genericUtility.getColumnValue("emp_code__hod", dom); //empCodeHOD = genericUtility.getColumnValue("emp_code__hod", dom);
empCodeHOD = checkNull(genericUtility.getColumnValue("emp_code__hod", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(empCodeHOD != null && empCodeHOD.trim().length() > 0) if(empCodeHOD != null && empCodeHOD.trim().length() > 0)
{ {
...@@ -1618,17 +1742,18 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1618,17 +1742,18 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
workLocCode =checkNull(genericUtility.getColumnValue("work_loc_code", dom));
//workLocCode = genericUtility.getColumnValue("work_loc_code", dom); //workLocCode = genericUtility.getColumnValue("work_loc_code", dom);
workLocCode =checkNull(genericUtility.getColumnValue("work_loc_code", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(workLocCode != null && workLocCode.trim().length() > 0) if(workLocCode != null && workLocCode.trim().length() > 0)
{ {
cnt = isValueExist("WORK_LOCATIONS","work_loc_code",workLocCode, conn); cnt = isValueExist("WORK_LOCATIONS","work_loc_code",workLocCode, conn);
if(cnt == 0) if(cnt == 0)
{ {
errList.add("VMEMPWLOC1"); //errList.add("VMEMPWLOC1");
errList.add("VMEMPWLOC2");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPWLOC1"); msgType = errorType(conn, "VMEMPWLOC2");
if (msgType.equalsIgnoreCase("E")) if (msgType.equalsIgnoreCase("E"))
{ {
break; break;
...@@ -1664,10 +1789,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -1664,10 +1789,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
System.out.println("In Validation of : ["+childNodeName+"]"); System.out.println("In Validation of : ["+childNodeName+"]");
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
handCtgr = checkNull(genericUtility.getColumnValue("handicap_category", dom));
phyHand = checkNull(genericUtility.getColumnValue("physical_handicap", dom));
//handCtgr = genericUtility.getColumnValue("handicap_category", dom); //handCtgr = genericUtility.getColumnValue("handicap_category", dom);
//phyHand = genericUtility.getColumnValue("physical_handicap", dom); //phyHand = genericUtility.getColumnValue("physical_handicap", dom);
handCtgr = checkNull(genericUtility.getColumnValue("handicap_category", dom));
phyHand = checkNull(genericUtility.getColumnValue("physical_handicap", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(phyHand != null && phyHand.trim().equals("Y")) if(phyHand != null && phyHand.trim().equals("Y"))
{ {
...@@ -2143,6 +2268,160 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2143,6 +2268,160 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
//Modified by Ahmed on 22/AUG/2016 [A16ESUN005][To validate when negative value is entered in below fields][end] //Modified by Ahmed on 22/AUG/2016 [A16ESUN005][To validate when negative value is entered in below fields][end]
// Added By Poonam[09/07/2019].start
//count_code__birth
else if(childNodeName.equalsIgnoreCase("count_code__birth"))
{
String countCodeBirth =checkNull( genericUtility.getColumnValue("count_code__birth",dom));
if(countCodeBirth != null && countCodeBirth.trim().length() > 0)
{
cnt=isValueExist("country","count_code",countCodeBirth, conn);
if(cnt==0)
{
errList.add("VMEMPBCNT2");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPBCNT2");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
}
//mother_tongue
else if(childNodeName.equalsIgnoreCase("mother_tongue"))
{
String motherTongue =checkNull( genericUtility.getColumnValue("mother_tongue",dom));
if(motherTongue != null && motherTongue.trim().length() > 0)
{
/*String sql="select count(*) as cnt from gencodes where fld_name = 'LANGUAGE' and mod_name in ('W_EMP_COMPLETE' , 'X')"
+ " and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";*/
String sql="select count(*) as cnt from gencodes where fld_name = 'LANGUAGE' and mod_name in ('W_EMP_TEMP' , 'X')"
+ " and case when active is null then 'Y' else active END = 'Y' and fld_value = ? "; // Added By Poonam B[26-07-2019]
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, motherTongue);
rs = pstmt.executeQuery();
while(rs.next())
{
cnt = rs.getInt("cnt");
}
close(pstmt, rs);
if(cnt == 0)
{
errList.add("VMEMPMLNG2");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPMLNG2");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
}
//cast_category
else if(childNodeName.equalsIgnoreCase("cast_category"))
{
String castCategory =checkNull( genericUtility.getColumnValue("cast_category",dom));
if(castCategory != null && castCategory.trim().length() > 0)
{
/*String sql="select count(*) as cnt from gencodes where fld_name = 'CAST_CATEGORY' and mod_name in ('W_EMP_COMPLETE' , 'X') and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";*/
String sql="select count(*) as cnt from gencodes where fld_name = 'cast_category' and mod_name in ('w_emp_temp' , 'X') and "
+ "case when active is null then 'Y' else active END = 'Y' and fld_value = ? "; // Added by Poonam B [26-07-2019]
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, castCategory);
rs = pstmt.executeQuery();
while(rs.next())
{
cnt = rs.getInt("cnt");
}
close(pstmt, rs);
if(cnt == 0)
{
errList.add("VMEMPCCTG2");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPCCTG2");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
}
//m_status
else if(childNodeName.equalsIgnoreCase("m_status"))
{
String mStatus =checkNull( genericUtility.getColumnValue("m_status",dom));
if(mStatus == null || mStatus.trim().length() == 0)
{
errList.add("MEMPMSTS01");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "MEMPMSTS01");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
//retirement_age
else if(childNodeName.equalsIgnoreCase("retirement_age"))
{
String retirementAge = checkNull(genericUtility.getColumnValue("retirement_age",dom));
if(retirementAge != null && retirementAge.trim().length() < 0)
{
errList.add("VMEMPRET01");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPRET01");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
//retirement_date
else if(childNodeName.equalsIgnoreCase("retirement_date"))
{
Date birthDate1=null;
Date retirementDate1=null;
String retirementDate =checkNull( genericUtility.getColumnValue("retirement_date",dom));
System.out.println("In Validation of : ["+childNodeName+"]");
String birthDate =checkNull( genericUtility.getColumnValue("birth_date", dom));
//Added by Poonam B on[16.07.2019].start.to check date format
//Date birthDate1= sdf.parse(birthDate);
if(birthDate != null && birthDate.trim().length() > 0)
{
birthDate1 = sdf.parse(birthDate);
}
//Date retirementDate1= sdf.parse(retirementDate);
if(retirementDate != null && retirementDate.trim().length() > 0)
{
retirementDate1= sdf.parse(retirementDate);
}
System.out.println("retirementDate = "+retirementDate+" \nbirthDate = "+birthDate+
" \nretirementDate1 = "+retirementDate1+" \nbirthDate1 = "+birthDate1);
//Added by Poonam B on[16.07.2019].END.to check date format
if(birthDate != null && retirementDate !=null && retirementDate1.before(birthDate1))
{
errList.add("VMEMPRET02");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPRET02");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
// Added By Poonam[09/07/2019].end
}
} }
break; break;
} }
...@@ -2233,6 +2512,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2233,6 +2512,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} break; } break;
case 3 : case 3 :
System.out.println("Validation for Detail 3 Employee.........."); System.out.println("Validation for Detail 3 Employee..........");
parentNodeList = dom.getElementsByTagName("Detail3"); parentNodeList = dom.getElementsByTagName("Detail3");
...@@ -2354,6 +2634,40 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2354,6 +2634,40 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
//Added By Poonam B on[30-07-2019][START]
if(childNodeName.equalsIgnoreCase("pass_year"))
{
// Modified by Yashwant on 26/06/2019.Start
year = checkInt(genericUtility.getColumnValue("pass_year", dom));
//year = genericUtility.getColumnValue("year", dom);
// Modified by Yashwant on 26/06/2019.End
try
{
if(year != null && ( Integer.parseInt(year) < 0 || year.indexOf(".") == 1 ))
{
errList.add("VMEMPTRN02");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPTRN02");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
catch(Exception e)
{
errList.add("VMEMPTRN02");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPTRN02");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
//Added By Poonam B on[30-07-2019][END]
} }
break; break;
case 5 : case 5 :
...@@ -2412,12 +2726,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2412,12 +2726,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
if(childNodeName.equalsIgnoreCase("duration")) if(childNodeName.equalsIgnoreCase("duration"))
{ {
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
duration = checkInt(genericUtility.getColumnValue("duration", dom)); duration = genericUtility.getColumnValue("duration", dom);
//duration = genericUtility.getColumnValue("duration", dom); //duration = genericUtility.getColumnValue("duration", dom);
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
try{ try{
if(duration == null || Integer.parseInt(duration) < 0) if(duration == null || Integer.parseInt(checkInt(duration)) < 0)
{ {
errList.add("VMEMPTRN01"); errList.add("VMEMPTRN01");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -2469,6 +2783,26 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2469,6 +2783,26 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
//Added By Poonam B[30-07-2019][START]
if(childNodeName.equalsIgnoreCase("organisation"))
{
String organisation= "" ;
// Modified by Yashwant on 26/06/2019.Start
organisation = checkNull(genericUtility.getColumnValue("organisation", dom));
//organisation = genericUtility.getColumnValue("organisation", dom);
// Modified by Yashwant on 26/06/2019.End
if(organisation == null || organisation.trim().length() == 0)
{
errList.add("VMEMPEXP04");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPEXP04");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
//Added By Poonam B[30-07-2019][END]
} }
break; break;
case 6 : case 6 :
...@@ -2556,8 +2890,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2556,8 +2890,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break; break;
} }
} }
//Added by Ahmed on 11/12/2015[AD3DSUN001][END] //Added by Ahmed on 11/12/2015[AD3DSUN001][END]
} }
if(childNodeName.equalsIgnoreCase("organisation")) if(childNodeName.equalsIgnoreCase("organisation"))
...@@ -2654,6 +2986,27 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2654,6 +2986,27 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
} }
// Added By Poonam[09/07/2019].start
//count_code__work
if(childNodeName.equalsIgnoreCase("count_code__work"))
{
countCodeWork =checkNull( genericUtility.getColumnValue("count_code__work", dom));
if(countCodeWork != null && countCodeWork.trim().length() > 0)
{
cnt=isValueExist("country","count_code",countCodeWork, conn);
if(cnt == 0)
{
errList.add("VMEMPEXPC1");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMEMPEXPC1");
if (msgType.equalsIgnoreCase("E"))
{
break;
}
}
}
}
// Added By Poonam[09/07/2019].end
} }
break; break;
case 7 : case 7 :
...@@ -2671,6 +3024,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2671,6 +3024,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
childNodeValue = childNode.getFirstChild().getNodeValue(); childNodeValue = childNode.getFirstChild().getNodeValue();
} }
// Added By Poonam[25/07/2019].Start
System.out.println("childNodeValue " + childNodeValue);
// Added By Poonam[25/07/2019].End
if(childNodeName.equalsIgnoreCase("bank_code")) if(childNodeName.equalsIgnoreCase("bank_code"))
{ {
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
...@@ -2693,10 +3049,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2693,10 +3049,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else else
{ {
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
stanCode = checkNull(genericUtility.getColumnValue("stan_code", dom));
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
//stanCode = genericUtility.getColumnValue("stan_code", dom); //stanCode = genericUtility.getColumnValue("stan_code", dom);
//empCode = genericUtility.getColumnValue("emp_code", dom); //empCode = genericUtility.getColumnValue("emp_code", dom);
stanCode = checkNull(genericUtility.getColumnValue("stan_code", dom));
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(stanCode != null && stanCode.trim().length() > 0) if(stanCode != null && stanCode.trim().length() > 0)
{ {
...@@ -2724,7 +3080,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2724,7 +3080,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else else
{ {
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
paySite = checkNull(genericUtility.getColumnValue("pay_site", dom1)); paySite = checkNull(genericUtility.getColumnValue("pay_site", dom));
//paySite = genericUtility.getColumnValue("pay_site", dom1); //paySite = genericUtility.getColumnValue("pay_site", dom1);
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
//paySite = getFieldValue("pay_site","employee","emp_code",empCode,conn); //paySite = getFieldValue("pay_site","employee","emp_code",empCode,conn);
...@@ -2770,11 +3126,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2770,11 +3126,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
if(childNodeName.equalsIgnoreCase("amount")) if(childNodeName.equalsIgnoreCase("amount"))
{ {
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
amount = checkNull(genericUtility.getColumnValue("amount", dom)); amount = genericUtility.getColumnValue("amount", dom);
//amount = genericUtility.getColumnValue("amount", dom); //amount = genericUtility.getColumnValue("amount", dom);
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
float amtflt = 0.0f;
if(amount == null || Float.parseFloat(amount) < 0 || amount.trim().length() == 0) if(amount != null)
{
amtflt = Float.parseFloat(checkInt(amount));
}
if(amount == null || amtflt < 0 || amount.trim().length() == 0)
{ {
errList.add("VMEMPBNK04"); errList.add("VMEMPBNK04");
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
...@@ -2784,9 +3144,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2784,9 +3144,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break; break;
} }
} }
else /*else
{ {
float amtflt=Float.parseFloat(amount);
if(amtflt < 0) if(amtflt < 0)
{ {
errList.add("VMEMPBNK06"); errList.add("VMEMPBNK06");
...@@ -2797,7 +3156,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2797,7 +3156,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
break; break;
} }
} }
} }*/
} }
} }
break; break;
...@@ -2814,8 +3173,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2814,8 +3173,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
errCode = (String)errList.get(i); errCode = (String)errList.get(i);
errFldName = (String)errFields.get(i); errFldName = (String)errFields.get(i);
System.out.println("errCode .........."+errCode); System.out.println("errCode .........."+errCode);
errString = itmdbAccessEJB.getErrorString(errFldName, errCode, userId, "", conn); //Added by Poonam B on [25/07/2019][START]
//errString = getErrorString( errFldName, errCode, userId ); //errString = getErrorString( errFldName, errCode, userId );
errString = itmdbAccessEJB.getErrorString(errFldName, errCode, userId, "", conn);
//Added by Poonam B on [25/07/2019][END]
System.out.println("errString is : ::::>>>> " + errString); System.out.println("errString is : ::::>>>> " + errString);
msgType = errorType( conn , errCode ); msgType = errorType( conn , errCode );
if ( errString.length() > 0) if ( errString.length() > 0)
...@@ -2872,21 +3233,32 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2872,21 +3233,32 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
System.out.println("ErrString ::"+errString); System.out.println("ErrString ::"+errString);
return errString; return errString;
}//END OF VALIDATION }
//Added By Poonam B [30-07-2019][START]
public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams, String formName) throws RemoteException, ITMException
{
formNameGlob = formName;
String errString = checkNull(wfValData(xmlString, xmlString1, xmlString2, objContext, editFlag, xtraParams));
return errString;
}
//END OF VALIDATION
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams , String formName) throws RemoteException, ITMException
{
formNameGlob = formName;
String errString = checkNull(itemChanged(xmlString, xmlString1, xmlString2, objContext, currentColumn, editFlag, xtraParams));
return errString;
}
//Added By Poonam B [30-07-2019][END]
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
{ {
Document dom = null; Document dom = null;
Document dom1 = null; Document dom1 = null;
Document dom2 = null; Document dom2 = null;
String errString = null; String errString = null;
//Modified by Yashwant on 26/06/2019.Start // GenericUtility genericUtility = GenericUtility.getInstance();//commented by Poonam B[26-07-2019]
E12GenericUtility genericUtility = new E12GenericUtility();
//GenericUtility genericUtility = GenericUtility.getInstance();
//Modified by Yashwant on 26/06/2019.End
try try
{ {
System.out.println("EmployeeEJB:itemChanged value of xmlString ["+xmlString+"]"); System.out.println("EmployeeEJB:itemChanged value of xmlString ["+xmlString+"]");
...@@ -2926,10 +3298,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2926,10 +3298,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
int currentFormNo = 0; int currentFormNo = 0;
StringBuffer valueXmlString =null; StringBuffer valueXmlString =null;
//Modified by Yashwant on 26/06/2019.Start //GenericUtility genericUtility = GenericUtility.getInstance(); //commented by Poonam B[26-07-2019]
E12GenericUtility genericUtility = new E12GenericUtility();
//GenericUtility genericUtility = GenericUtility.getInstance();
//Modified by Yashwant on 26/06/2019.End
String code=""; String code="";
String addDate=""; String addDate="";
...@@ -2961,15 +3330,16 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2961,15 +3330,16 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
String mcode=""; String mcode="";
String mval1=""; String mval1="";
int mval2=0; int mval2=0;
String addr1 = "" , addr2 = "" , addr3 = "" , city = "" , pin = "",stateCode="" ; String addr1 = "" , addr2 = "" , addr3 = "" , city = "" , pin = "",stateCode="" ;
String tel1 = "" , tel2 = "" , tel3 = "" , curAdr1 = "" , peAdr1 = ""; String tel1 = "" , tel2 = "" , tel3 = "" , curAdr1 = "" , peAdr1 = "";
String shname = "" , contactPers = ""; String shname = "" , contactPers = "";
String shName=""; String shName="";
String contPers=""; String contPers="";
String shiftRot=""; String shiftRot="";
//Added By Poonam B [30-07-2019][START]
long revisionNo = 0;
String revNo = "";
//Added By Poonam B [30-07-2019][END]
//Modified by Azhar K. on 19/April/2019[To Trim Column name and value of employee name to process validation][Start] //Modified by Azhar K. on 19/April/2019[To Trim Column name and value of employee name to process validation][Start]
String value = "", newColumn = ""; String value = "", newColumn = "";
//Modified by Azhar K. on 19/April/2019[To Trim Column name and value of employee name to process validation][End] //Modified by Azhar K. on 19/April/2019[To Trim Column name and value of employee name to process validation][End]
...@@ -2992,10 +3362,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2992,10 +3362,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
int retirementAge = 0; int retirementAge = 0;
java.sql.Date birthDateDT =null; java.sql.Date birthDateDT =null;
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end] //Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
// Modified by Yashwant on 26/06/2019.Start
ITMDBAccessEJB itmdbAccessEJB=new ITMDBAccessEJB();
// Modified by Yashwant on 26/06/2019.End
try try
{ {
System.out.println("CURRENT COLUMN:::::"+currentColumn); System.out.println("CURRENT COLUMN:::::"+currentColumn);
...@@ -3009,10 +3375,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3009,10 +3375,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"); loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"); chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
String objNameDefault = checkNull(getObjName(dom ,objContext)); String objNameDefault = checkNull(getObjName(dom ,objContext));
//
empCode = checkNull(genericUtility.getColumnValue("report_to__admin", dom)); empCode = checkNull(genericUtility.getColumnValue("report_to__admin", dom));
//empCode = genericUtility.getColumnValue("report_to__admin", dom); //empCode = genericUtility.getColumnValue("report_to__admin", dom);
//
if(editFlag == null || editFlag.trim().length() == 0) if(editFlag == null || editFlag.trim().length() == 0)
{ {
editFlg="A"; editFlg="A";
...@@ -3051,9 +3415,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3051,9 +3415,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Ahmed on 23/AUG/2016[A16ESUN005][To set confirmed column as N and non-editable in add mode][end] //Modified by Ahmed on 23/AUG/2016[A16ESUN005][To set confirmed column as N and non-editable in add mode][end]
//Added by Sana to set name_prefix , basic , gross , salary with_held on itm_default][Start] //Added by Sana to set name_prefix , basic , gross , salary with_held on itm_default][Start]
//Modified by Yashwant on 03/07/2019[start] //Modified by Yashwant on 03/07/2019[start]
String mdescr=admCommon.getEnv("999999", "NATIONAL", connection); String mdescr=admCommon.getEnv("999999", "NATIONAL", connection);
if(mdescr!=null && mdescr.trim().length()>0) if(mdescr!=null && mdescr.trim().length()>0)
{ {
...@@ -3124,7 +3486,26 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3124,7 +3486,26 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
System.out.println("ItemChange of:::::"+currentColumn); System.out.println("ItemChange of:::::"+currentColumn);
// Piyush - 29/07/2019.Start // Piyush - 29/07/2019.Start
//Added by Poonam B on[30-07-2019][START]
System.out.println("formNameGlob " + formNameGlob);
if(currentFormNo == 1 && "Header".equals(formNameGlob))
{
revNo= checkNull( genericUtility.getColumnValue("revision_no", dom));
try
{
revisionNo = (revNo != null && revNo.trim().length() > 0) ? Long.parseLong(revNo):0;
}
catch (Exception e)
{
revisionNo = 0;
throw new ITMException(e);
}
revisionNo = revisionNo + 1;
valueXmlString.append("<revision_no><![CDATA[").append(revisionNo).append("]]></revision_no>\r\n");
}
else
{
//Added by Poonam B on[30-07-2019][END]
empClass = checkNull(genericUtility.getColumnValue("emp_class", dom)); empClass = checkNull(genericUtility.getColumnValue("emp_class", dom));
if(empClass != null && empClass.trim().length() > 0) if(empClass != null && empClass.trim().length() > 0)
{ {
...@@ -3204,7 +3585,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3204,7 +3585,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
else else
{ {
curStat = ""; curStat = "";
valueXmlString.append("<cur_state protect=\"1\">").append("<![CDATA[" + curStat + "]]>").append("</cur_state>"); valueXmlString.append("<cur_state protect=\"0\">").append("<![CDATA[" + curStat + "]]>").append("</cur_state>");
} }
setNodeValue(dom, "cur_state", curStat); setNodeValue(dom, "cur_state", curStat);
...@@ -3500,8 +3881,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3500,8 +3881,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<m_status>").append("<![CDATA[U]]>").append("</m_status>"); valueXmlString.append("<m_status>").append("<![CDATA[U]]>").append("</m_status>");
} }
long revisionNo = 0; revisionNo = 0;
String revNo = checkNull(genericUtility.getColumnValue("revision_no", dom)); revNo = checkNull(genericUtility.getColumnValue("revision_no", dom));
try try
{ {
revisionNo = (revNo != null && revNo.trim().length() > 0) ? Long.parseLong(revNo):0; revisionNo = (revNo != null && revNo.trim().length() > 0) ? Long.parseLong(revNo):0;
...@@ -3527,13 +3908,18 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3527,13 +3908,18 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
// Piyush - 29/07/2019.End // Piyush - 29/07/2019.End
} }
}
else if(currentColumn.trim().equalsIgnoreCase("contact_code")) else if(currentColumn.trim().equalsIgnoreCase("contact_code"))
{ {
System.out.println("ItemChange of:::::"+currentColumn); System.out.println("ItemChange of:::::"+currentColumn);
lname=""; lname="";
fname=""; fname="";
mName=""; mName="";
// Modified by Yashwant on 26/06/2019.Start String name="";
String fnameLong="";
String mnameLong="";
String lnameLong="";
contactCode = checkNull(genericUtility.getColumnValue("contact_code", dom)); contactCode = checkNull(genericUtility.getColumnValue("contact_code", dom));
//contactCode = genericUtility.getColumnValue("contact_code", dom); //contactCode = genericUtility.getColumnValue("contact_code", dom);
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
...@@ -3546,7 +3932,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3546,7 +3932,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
if(rs.next()) if(rs.next())
{ {
// To divide the name in parts // To divide the name in parts
String name=rs.getString("NAME"); name = rs.getString("NAME");
String[] parts = name.split(" "); String[] parts = name.split(" ");
for(int i=0;i<parts.length;i++) for(int i=0;i<parts.length;i++)
{ {
...@@ -5298,13 +5684,13 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5298,13 +5684,13 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
if (currentColumn.equalsIgnoreCase("grat_nominee")) if (currentColumn.equalsIgnoreCase("grat_nominee"))
{ {
System.out.println("ItemChange2 of:::::"+currentColumn); System.out.println("ItemChange2 of:::::"+currentColumn);
float gratpercent=0; float gratpercent = 0;
// Modified by Yashwant on 26/06/2019.Start // Modified by Yashwant on 26/06/2019.Start
//gratNominee = genericUtility.getColumnValue("grat_nominee", dom); //gratNominee = genericUtility.getColumnValue("grat_nominee", dom);
gratNominee =checkNull( genericUtility.getColumnValue("grat_nominee", dom)); gratNominee =checkNull( genericUtility.getColumnValue("grat_nominee", dom));
System.out.println("gratNominee :::::"+gratNominee); System.out.println("gratNominee :::::"+gratNominee);
//gratPerc = genericUtility.getColumnValue("grat_perc", dom); //gratPerc = genericUtility.getColumnValue("grat_perc", dom);
gratPerc = checkNull(genericUtility.getColumnValue("grat_perc", dom)); gratPerc = checkInt(genericUtility.getColumnValue("grat_perc", dom));
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(gratPerc != null) if(gratPerc != null)
{ {
...@@ -5352,7 +5738,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5352,7 +5738,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
if(pfNominee.equals("Y") && (pfPerc == null || pfpercent == 0)) if(pfNominee.equals("Y") && (pfPerc == null || pfpercent == 0))
{ {
valueXmlString.append("<pf_perc protect=\"0\"><![CDATA[]]></pf_perc>\r\n"); valueXmlString.append("<pf_perc protect=\"0\"><![CDATA[100]]></pf_perc>\r\n");
} }
else if(pfNominee.equals("N")) else if(pfNominee.equals("N"))
{ {
...@@ -5391,7 +5777,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5391,7 +5777,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
if(penNominee.equals("Y") && (penPerc == null || penpercent == 0)) if(penNominee.equals("Y") && (penPerc == null || penpercent == 0))
{ {
valueXmlString.append("<pen_perc protect=\"0\"><![CDATA[]]></pen_perc>\r\n"); valueXmlString.append("<pen_perc protect=\"0\"><![CDATA[100]]></pen_perc>\r\n");
} }
else if(penNominee.equals("N")) else if(penNominee.equals("N"))
{ {
...@@ -5676,7 +6062,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5676,7 +6062,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Added by Ahmed on 11/12/2015[AD3DSUN001][START] //Added by Ahmed on 11/12/2015[AD3DSUN001][START]
if(currentColumn.equalsIgnoreCase("gross_amt")) if(currentColumn.equalsIgnoreCase("gross_amt"))
{ {
String grossAmt = checkNull(genericUtility.getColumnValue("gross_amt", dom)); String grossAmt = checkInt(genericUtility.getColumnValue("gross_amt", dom));
double grossAmtNum = 0d; double grossAmtNum = 0d;
long grossAmtInt = 0; long grossAmtInt = 0;
if(grossAmt.length() > 0) if(grossAmt.length() > 0)
...@@ -6587,7 +6973,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6587,7 +6973,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
//Modified by Yashwant on 04/07/2019[End] //Modified by Yashwant on 04/07/2019[End]
*/ */
// Piyush - 29/07/2019.Start // Piyush - 29/07/2019.Start
private static void setNodeValue(Document dom, String nodeName, String nodeVal) throws Exception { private static void setNodeValue(Document dom, String nodeName, String nodeVal) throws Exception {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment