Skip to content

B
business-java
Commit 47120418 authored by dpingle's avatar dpingle
Browse files
Options

* changes done for Employee Work Detail- obj_name: emp_work_info 

EmpWorkInfo.java
EmpWorkInfoLocal.java
EmpWorkInfoPrs.java
emp_work_info21.xml
d_emp_work_info21.srd
w_emp_work_info.sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205033 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8d7f08c8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 507 additions and 567 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpWorkInfo.java
View file @ 47120418
package ibase.webitm.ejb.adm; package ibase.webitm.ejb.adm;
import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility; //Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ]
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
...@@ -14,14 +10,15 @@ import java.util.ArrayList; ...@@ -14,14 +10,15 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import javax.ejb.Stateless;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap; 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.utility.E12GenericUtility; //Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ]
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException;
//Modified By Dipesh on[22/07/2019][Start] //Modified By Dipesh on[22/07/2019][Start]
//@Stateless //@Stateless
...@@ -133,7 +130,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -133,7 +130,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
String cadreCode = ""; String cadreCode = "";
String gradeCode = ""; String gradeCode = "";
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end] //Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
String siteCode = "" ; //Added by sarita on 18 July 2019
//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start] //Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
//GenericUtility genericUtility = GenericUtility.getInstance(); //GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
...@@ -440,45 +437,6 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -440,45 +437,6 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
valueXmlString.append("<probation_prd protect=\"0\"><![CDATA[").append(probationPrd).append("]]></probation_prd>\r\n"); valueXmlString.append("<probation_prd protect=\"0\"><![CDATA[").append(probationPrd).append("]]></probation_prd>\r\n");
} }
} }
//Added by sarita on 18 JULY 2019 to set protect/un-protect retirement_date [START]
dateAf = genericUtility.getColumnValue("retirement_date", dom);
System.out.println("retirement_date :: ["+dateAf+"]");
sql = "SELECT PAY_SITE, CADRE, GRADE,BIRTH_DATE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCode = checkNull(rs.getString("PAY_SITE"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
birthDateDT = rs.getDate("BIRTH_DATE");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn));
}
if("Y".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
}
else
{
valueXmlString.append("<retirement_date protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
}
//Added by sarita on 18 JULY 2019 to set protect/un-protect retirement_date[END]
} }
else if (currentColumn.equalsIgnoreCase("emp_site")) else if (currentColumn.equalsIgnoreCase("emp_site"))
{ {
...@@ -730,18 +688,8 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -730,18 +688,8 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][start] //Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][start]
if(currentColumn.trim().equalsIgnoreCase("retirement_age")) if(currentColumn.trim().equalsIgnoreCase("retirement_age"))
{ {
retAge = genericUtility.getColumnValue("retirement_age", dom); retAge = checkNull(genericUtility.getColumnValue("retirement_age", dom));
//Modified by Rohini T on 18/07/19 [start] retirementAge = Integer.parseInt(retAge);
try
{
retirementAge = (retAge != null && retAge.trim().length() > 0 ) ?Integer.parseInt(retAge):0;
}
catch (Exception e)
{
e.getMessage();
}
//retirementAge = Integer.parseInt(retAge);
//Modified by Rohini T on 18/07/19 [end]
//Modified by Rohini T on 26/04/19 [start] //Modified by Rohini T on 26/04/19 [start]
//retireAge = retirementAge * 12; //retireAge = retirementAge * 12;
retireAge = retirementAge ; retireAge = retirementAge ;
...@@ -750,12 +698,11 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -750,12 +698,11 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
System.out.println("empCode:::::::"+empCode); System.out.println("empCode:::::::"+empCode);
//Modified by Rohini T on[15/05/19][start] //Modified by Rohini T on[15/05/19][start]
//Modified by Rohini T on[15/05/19][start] //Modified by Rohini T on[15/05/19][start]
//String siteCode = "" ; Commented by sarita on 18 JULY 2019 String siteCode = "" ;
sql = "SELECT PAY_SITE, CADRE, GRADE,BIRTH_DATE FROM EMPLOYEE WHERE EMP_CODE = ?"; sql = "SELECT PAY_SITE, CADRE, GRADE,BIRTH_DATE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
siteCode = checkNull(rs.getString("PAY_SITE")); siteCode = checkNull(rs.getString("PAY_SITE"));
...@@ -832,8 +779,6 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -832,8 +779,6 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
{ {
dateAf = getCurrdateAppFormat(toDate); dateAf = getCurrdateAppFormat(toDate);
} }
//Modified by Rohini T on 18/07/19 [start]
/*
if("N".equalsIgnoreCase(retirementDateVarVal) ) if("N".equalsIgnoreCase(retirementDateVarVal) )
{ {
valueXmlString.append("<retirement_date protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n"); valueXmlString.append("<retirement_date protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
...@@ -841,19 +786,13 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -841,19 +786,13 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
else else
{ {
valueXmlString.append("<retirement_date protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n"); valueXmlString.append("<retirement_date protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
}*/ }
//Modified by Rohini T on 18/07/19 [end]
} }
} }
else else
{ {
sql = "select DBF_CALC_RETIRE_DATE( ?,?,?) as retirement_date" +
//Modified by Rohini T on 18/07/19 [start]
/*sql = "select DBF_CALC_RETIRE_DATE( ?,?,?) as retirement_date" +
" from dual";*/
sql = "select "+varValue+"( ?,?,?) as retirement_date" +
" from dual"; " from dual";
//Modified by Rohini T on 18/07/19 [end]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
pstmt.setDouble(2, retireAge); pstmt.setDouble(2, retireAge);
...@@ -878,10 +817,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -878,10 +817,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
if(RetDateDT != null ) if(RetDateDT != null )
{ {
dateAf = getCurrdateAppFormat(RetDateDT); dateAf = getCurrdateAppFormat(RetDateDT);
//System.out.println("dateAf:::"+dateAf);
} }
//Modified by Rohini T on 18/07/19 [start]
/*
if("N".equalsIgnoreCase(retirementDateVarVal) ) if("N".equalsIgnoreCase(retirementDateVarVal) )
{ {
valueXmlString.append("<retirement_date protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n"); valueXmlString.append("<retirement_date protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
...@@ -889,29 +825,14 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -889,29 +825,14 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
else else
{ {
valueXmlString.append("<retirement_date protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n"); valueXmlString.append("<retirement_date protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
}*/
//Modified by Rohini T on 18/07/19 [end]
}
//Modified by Rohini T on 18/07/19 [start]
System.out.println("PROTECT_RETIRE_DATE :: ["+retirementDateVarVal+"]");
if("Y".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
} }
else
{
valueXmlString.append("<retirement_date protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date>\r\n");
} }
//Modified by Rohini T on 18/07/19 [end]
} }
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
valueXmlString.append("</Detail1>\r\n");
}//End of Case 1 }//End of Case 1
valueXmlString.append("</Detail1>\r\n");
break; break;
}//END OF SWITCH }//END OF SWITCH
valueXmlString.append("</Root>\r\n");
}//End of try block }//End of try block
catch(Exception e) catch(Exception e)
{ {
...@@ -947,13 +868,10 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -947,13 +868,10 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
throw new ITMException(e); throw new ITMException(e);
} }
}//End of finally block }//End of finally block
valueXmlString.append("</Root>\r\n");
System.out.println("valueXmlString....["+valueXmlString.toString()); System.out.println("valueXmlString....["+valueXmlString.toString());
return valueXmlString.toString(); return valueXmlString.toString();
}//End of itemChanged block }//End of itemChanged block
//Start of wfValData Start //Start of wfValData Start
public String wfValData() throws RemoteException,ITMException public String wfValData() throws RemoteException,ITMException
{ {
...@@ -1130,6 +1048,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -1130,6 +1048,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
conn.setAutoCommit(false); conn.setAutoCommit(false);
//30/10/2014.End //30/10/2014.End
if(objContext != null && objContext.trim().length()>0) if(objContext != null && objContext.trim().length()>0)
{ {
currentFormNo = Integer.parseInt(objContext); currentFormNo = Integer.parseInt(objContext);
...@@ -1846,8 +1765,8 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -1846,8 +1765,8 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
} }
} }
} }
}//End of case
break; break;
}//End of case
}//End of Switch }//End of Switch
int errListSize = errList.size(); int errListSize = errList.size();
if ( errList != null && errListSize > 0 ) if ( errList != null && errListSize > 0 )
...@@ -1880,14 +1799,14 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -1880,14 +1799,14 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
errList = null; errList = null;
errFields.clear(); errFields.clear();
errFields = null; errFields = null;
errStringXml.append("</Errors></Root>\r\n");
} }
else /*else
{ {
errStringXml = new StringBuffer( "" ); errStringXml = new StringBuffer( "" );
} }
errString = errStringXml.toString(); errString = errStringXml.toString();*/
errStringXml.append("</Errors></Root>\r\n");
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
} }
catch(Exception e) catch(Exception e)
...@@ -1924,7 +1843,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -1924,7 +1843,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
} }
} }
errString = errStringXml.toString();
return errString; return errString;
} }
//Start of wfValData End //Start of wfValData End
...@@ -2219,6 +2138,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -2219,6 +2138,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
return returnDate ; return returnDate ;
} }
......
webitm-adm/ibase/webitm/ejb/adm/EmpWorkInfoLocal.java
View file @ 47120418
package ibase.webitm.ejb.adm; package ibase.webitm.ejb.adm;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
@javax.ejb.Local @javax.ejb.Local
......
webitm-adm/ibase/webitm/ejb/adm/EmpWorkInfoPrs.java
View file @ 47120418
...@@ -2,19 +2,24 @@ ...@@ -2,19 +2,24 @@
package ibase.webitm.ejb.adm; package ibase.webitm.ejb.adm;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.*; import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import org.w3c.dom.*; import org.w3c.dom.Document;
import ibase.webitm.ejb.*; import org.w3c.dom.Node;
import ibase.webitm.utility.ITMException; import org.w3c.dom.NodeList;
import ibase.utility.E12GenericUtility;
import ibase.system.config.*;
import javax.naming.InitialContext;
import java.util.*;
@javax.ejb.Stateless import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException;
//Added by Dipesh on[23/07/2019][Start]
//@javax.ejb.Stateless
//Added by Dipesh on[23/07/2019][End]
public class EmpWorkInfoPrs extends ValidatorEJB public class EmpWorkInfoPrs extends ValidatorEJB
{ {
public String preSave()throws RemoteException,ITMException public String preSave()throws RemoteException,ITMException
...@@ -33,7 +38,6 @@ public class EmpWorkInfoPrs extends ValidatorEJB ...@@ -33,7 +38,6 @@ public class EmpWorkInfoPrs extends ValidatorEJB
String posCode = ""; String posCode = "";
java.util.Date dateJoindb = null; java.util.Date dateJoindb = null;
String dateJoinOld = ""; String dateJoinOld = "";
String sql = ""; String sql = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -44,23 +48,26 @@ public class EmpWorkInfoPrs extends ValidatorEJB ...@@ -44,23 +48,26 @@ public class EmpWorkInfoPrs extends ValidatorEJB
// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start // Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start
String userIdDom = ""; String userIdDom = "";
String userIdDB = ""; String userIdDB = "";
//Commented and added by Varsha V on 20-Jul-18 for removing lookup //Added by Dipesh on[23/07/2019][Start]
//ITMDBAccessLocal itmdbAccessLocal = null ; //ITMDBAccessLocal itmdbAccessLocal = null ;
ITMDBAccessEJB itmDBAccess = null; ITMDBAccessEJB itmDbAccess = null;
String errString = "";
//String errFldName = "";
//Added by Dipesh on[23/07/2019][End]
// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End // Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End
try try
{ {
// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start // Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].Start
//Commented and added by Varsha V on 20-Jul-18 for removing lookup //Added by Dipesh on[23/07/2019][Start]
//AppConnectParm appConnect = new AppConnectParm(); /*AppConnectParm appConnect = new AppConnectParm();
//Properties p = appConnect.getProperty(); Properties p = appConnect.getProperty();
//InitialContext ctx = new InitialContext(p); InitialContext ctx = new InitialContext(p);
//itmdbAccessLocal = (ITMDBAccessLocal)ctx.lookup("ibase/ITMDBAccessEJB/local"); itmdbAccessLocal = (ITMDBAccessLocal)ctx.lookup("ibase/ITMDBAccessEJB/local");*/
itmDBAccess = new ITMDBAccessEJB();
// Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End // Modified by Piyush on 08/12/2014 [To update user id in users table if changed CCF No. CQ14/CS1089 - A14GSUN004].End
itmDbAccess = new ITMDBAccessEJB();
//Added by Dipesh on[23/07/2019][End]
conn.setAutoCommit( false ); conn.setAutoCommit( false );
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
...@@ -155,10 +162,11 @@ public class EmpWorkInfoPrs extends ValidatorEJB ...@@ -155,10 +162,11 @@ public class EmpWorkInfoPrs extends ValidatorEJB
} }
if (usrUpdateCnt != usrCnt) if (usrUpdateCnt != usrCnt)
{ {
//Commented and added by Varsha V on 20-Jul-18 for calling connection method //Added by Dipesh on[23/07/2019][Start]
//retString = itmdbAccessLocal.getErrorString("","VTEMPUID01",""); //retString = itmdbAccessLocal.getErrorString("","VTEMPUID01","");
retString = itmDBAccess.getErrorString("", "VTMARPRFL", "", "", conn); errString = itmDbAccess.getErrorString("", "VTEMPUID01", userId, "", conn);
return retString; return errString;
//Added by Dipesh on[23/07/2019][End]
} }
} }
} }
...@@ -239,7 +247,8 @@ public class EmpWorkInfoPrs extends ValidatorEJB ...@@ -239,7 +247,8 @@ public class EmpWorkInfoPrs extends ValidatorEJB
try try
{ {
NodeList detailList = null; NodeList detailList = null;
Node currDetail = null,reqDetail = null; Node currDetail = null;
//Node reqDetail = null;
int detailListLength = 0; int detailListLength = 0;
detailList = dom.getElementsByTagName("Detail1"); detailList = dom.getElementsByTagName("Detail1");
......
webitm-adm/module-resource/SQL/w_emp_work_info.sql 0 → 100644
View file @ 47120418
This diff is collapsed.
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