Commit d07b2d8a authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 21/11/19

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212511 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 236fe8ef
...@@ -16,6 +16,7 @@ import org.w3c.dom.Node; ...@@ -16,6 +16,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -88,6 +89,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -88,6 +89,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
Timestamp dateFor = null,dateTo = null,dayFrom1=null,dayTo1=null; Timestamp dateFor = null,dateTo = null,dayFrom1=null,dayTo1=null;
SimpleDateFormat sdf = new SimpleDateFormat("EEEE"); SimpleDateFormat sdf = new SimpleDateFormat("EEEE");
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
try try
{ {
System.out.println("currentFormNo...." + currentFormNo); System.out.println("currentFormNo...." + currentFormNo);
...@@ -210,8 +212,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -210,8 +212,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
pstmt = null; pstmt = null;
} }
valueXmlString.append("<emp_fname><![CDATA[").append(empFname).append("]]></emp_fname>"); valueXmlString.append("<emp_fname protect=\"1\"><![CDATA[").append(empFname).append("]]></emp_fname>");
valueXmlString.append("<emp_lname><![CDATA[").append(empLname).append("]]></emp_lname>"); valueXmlString.append("<emp_lname protect=\"1\"><![CDATA[").append(empLname).append("]]></emp_lname>");
valueXmlString.append("<work_site><![CDATA[").append(work_site).append("]]></work_site>"); valueXmlString.append("<work_site><![CDATA[").append(work_site).append("]]></work_site>");
} }
...@@ -341,18 +343,18 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -341,18 +343,18 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
} }
catch (Exception e) catch (Exception e)
{ {
System.out.println("Exception :DeptIC :wfValData(String xmlString):"+ e.getMessage() + ":"); System.out.println("Exception :HolChangeIC :wfValData(String xmlString):"+ e.getMessage() + ":");
errString = genericUtility.createErrorString(e); errString = genericUtility.createErrorString(e);
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
System.out.println("returning from DeptIC wfvaldata"); System.out.println("returning from HolChangeIC 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
{ {
ITMDBAccessEJB itmDbAcess = null;
String userId = ""; String userId = "";
String sql = ""; String sql = "";
String errString = ""; String errString = "";
...@@ -376,13 +378,15 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -376,13 +378,15 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
String holDateFor=""; String holDateFor="";
String holType=""; String holType="";
String hol=""; String hol="";
String holDateFTo=""; String holDateTo="";
String mLevel = "", loginSite = ""; String mLevel = "", loginSite = "";
Timestamp dateFor = null,dateTo = null; Timestamp dateFor = null,dateTo = null;
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
try try
{ {
itmDbAcess = new ITMDBAccessEJB();
connectionObject = getConnection(); connectionObject = getConnection();
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode")); userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
System.out.println("Line no--468"); System.out.println("Line no--468");
...@@ -434,6 +438,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -434,6 +438,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
{ {
empCode =checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode =checkNull(genericUtility.getColumnValue("emp_code", dom));
sql = "select count(*) as cnt from employee where emp_code = ? and " sql = "select count(*) as cnt from employee where emp_code = ? and "
+ "work_site = (case when ? > 1 then ? else work_site end)"; + "work_site = (case when ? > 1 then ? else work_site end)";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
...@@ -456,30 +461,86 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -456,30 +461,86 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
pstmt = null; pstmt = null;
} }
if(empCode == null || empCode.trim().length() == 0) if(empCode == null || empCode.length() == 0)
{ {
errCode = "VMEMP1"; //Modified by Sana S on 19/11/19 [start]
/*errCode = "VMEMP1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMEMP1" , userId, "", connectionObject);
return errString;
//Modified by Sana S on 19/11/19 [end]
} }
else if(cnt == 0) else if(cnt == 0)
{ {
errCode = "VMEMPCD1"; //Modified by Sana S on 19/11/19 [start]
/*errCode = "VMEMPCD1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMEMPCD1" , userId, "", connectionObject);
return errString;
//Modified by Sana S on 19/11/19 [end]
}
//Adeded by Sana S for Duplicate record checking on 20/11/19 [start]
else
{
holType =checkNull(genericUtility.getColumnValue("hol_type", dom));
holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom));
holDateTo=checkNull(genericUtility.getColumnValue("hol_date_to", dom));
sql="select count(1) as cnt from change_holiday where emp_code= ? and hol_date_for=? and hol_date_to = ? and hol_type= ?";
pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, holDateFor);
pstmt.setString(3, holDateTo);
pstmt.setString(4, holType);
//pstmt.setString(5, effDateStr);
resultSet = pstmt.executeQuery();
if (resultSet.next())
{
cnt = resultSet.getInt("cnt");
}
if (resultSet != null)
{
resultSet.close();
resultSet = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt > 0 && "A".equalsIgnoreCase(editFlag))
{
System.out.print("Duplicate");
/*errCode="VTDUPREC";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDUPREC" , userId, "", connectionObject);
return errString;
}
} }
//Adeded by Sana S on 20/11/19 [end]
} }
else if(childNodeName.equalsIgnoreCase("hol_date_for")) else if(childNodeName.equalsIgnoreCase("hol_date_for"))
{ {
System.out.println("line --509"); System.out.println("line --509");
empCode =checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode =checkNull(genericUtility.getColumnValue("emp_code", dom));
holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom)); holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom));
dateFor = Timestamp.valueOf(genericUtility.getValidDateString(holDateFor, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); //dateFor = Timestamp.valueOf(genericUtility.getValidDateString(holDateFor, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");////Modified by Sana S on 19/11/19
System.out.println("holDateFor::::"+holDateFor);
sql = "select fn_get_holtblno(?,?) as ls_hol from dual"; sql = "select fn_get_holtblno(?,?) as ls_hol from dual";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setTimestamp(2, dateFor); //pstmt.setTimestamp(2, dateFor);
pstmt.setString(2, holDateFor);//Modified by Sana S on 19/11/19
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
if(resultSet.next()) if(resultSet.next())
...@@ -499,7 +560,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -499,7 +560,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
sql = "select count(1) as cnt from holiday where hol_date = ? and hol_tblno = ? "; sql = "select count(1) as cnt from holiday where hol_date = ? and hol_tblno = ? ";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setTimestamp(1, dateFor); //pstmt.setTimestamp(1, dateFor);
pstmt.setString(1, holDateFor);//Modified on 19/11/19
pstmt.setString(2, hol); pstmt.setString(2, hol);
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
...@@ -509,9 +571,15 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -509,9 +571,15 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
} }
if(cnt<1) if(cnt<1)
{ {
errCode = "VMHOLF1"; //Modified on 19/11/19 [start]
/*errCode = "VMHOLF1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMHOLF1" , userId, "", connectionObject);
return errString;
//Modified on 19/11/19 [end]
} }
if (resultSet != null) if (resultSet != null)
{ {
...@@ -527,13 +595,14 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -527,13 +595,14 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
empCode =checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode =checkNull(genericUtility.getColumnValue("emp_code", dom));
holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom)); holDateFor = checkNull(genericUtility.getColumnValue("hol_date_for", dom));
dateFor = Timestamp.valueOf(genericUtility.getValidDateString(holDateFor, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); dateFor = Timestamp.valueOf(genericUtility.getValidDateString(holDateFor, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
holDateFTo=checkNull(genericUtility.getColumnValue("hol_date_to", dom)); holDateTo=checkNull(genericUtility.getColumnValue("hol_date_to", dom));
dateTo = Timestamp.valueOf(genericUtility.getValidDateString(holDateFTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); dateTo = Timestamp.valueOf(genericUtility.getValidDateString(holDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
sql = "select fn_get_holtblno(?,?) as ls_hol from dual"; sql = "select fn_get_holtblno(?,?) as ls_hol from dual";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setTimestamp(2, dateFor); //pstmt.setTimestamp(2, dateFor);
pstmt.setString(2, holDateFor);////Modified on 19/11/19
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
if(resultSet.next()) if(resultSet.next())
...@@ -553,7 +622,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -553,7 +622,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
sql = "select count(*) as cnt from holiday where hol_date = ? and hol_tblno = ?"; sql = "select count(*) as cnt from holiday where hol_date = ? and hol_tblno = ?";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setTimestamp(1, dateTo); //pstmt.setTimestamp(1, dateTo);
pstmt.setString(1, holDateTo);
pstmt.setString(2, hol); pstmt.setString(2, hol);
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
...@@ -567,7 +637,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -567,7 +637,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
pstmt.setString(2, hol); pstmt.setString(2, hol);
pstmt.setTimestamp(3, dateFor); //pstmt.setTimestamp(3, dateTo);
pstmt.setString(3, holDateTo);//Modified by Sana S on 19/11/19
pstmt.setString(4, "Y"); pstmt.setString(4, "Y");
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
...@@ -577,9 +648,15 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -577,9 +648,15 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
} }
if(cnt == 0) if(cnt == 0)
{ {
errCode = "VMHOL1"; //Modified by Sana S on 19/11/19 [start]
/*errCode = "VMHOL1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMHOL1" , userId, "", connectionObject);
return errString;
//Modified by Sana S on 19/11/19 [end]
} }
if (resultSet != null) if (resultSet != null)
{ {
...@@ -610,7 +687,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -610,7 +687,8 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
sql = "select hol_type as ls_hol_type from holiday where hol_date = ? and hol_tblno = ? and hol_type = ?"; sql = "select hol_type as ls_hol_type from holiday where hol_date = ? and hol_tblno = ? and hol_type = ?";
pstmt = connectionObject.prepareStatement(sql); pstmt = connectionObject.prepareStatement(sql);
pstmt.setTimestamp(1, dateFor); //pstmt.setTimestamp(1, dateFor);
pstmt.setString(1, holDateFor);//Modified by Sana S on 19/11/19
pstmt.setString(2, hol); pstmt.setString(2, hol);
pstmt.setString(3, holType); pstmt.setString(3, holType);
resultSet = pstmt.executeQuery(); resultSet = pstmt.executeQuery();
...@@ -620,15 +698,27 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -620,15 +698,27 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
} }
if(holType.equals("H")) if(holType.equals("H"))
{ {
errCode = "VTHOLCHG"; //Modified by Sana S on 19/11/19 [start]
/*errCode = "VTHOLCHG";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTHOLCHG" , userId, "", connectionObject);
return errString;
//Modified by Sana S on 19/11/19 [end]
} }
else if(holType.trim() == "") else if(holType.trim() == "")
{ {
errCode = "VTHOLNOT"; //Modified by Sana S on 19/11/19 [start]
/*errCode = "VTHOLNOT";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTHOLNOT" , userId, "", connectionObject);
return errString;
//Modified by Sana S on 19/11/19[end]
} }
if (resultSet != null) if (resultSet != null)
{ {
...@@ -647,7 +737,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -647,7 +737,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
} }
} }
int errListSize = errList.size(); /*int errListSize = errList.size();
System.out.print("errList:"+errList); System.out.print("errList:"+errList);
System.out.print("errListSize:"+errListSize); System.out.print("errListSize:"+errListSize);
cnt = 0; cnt = 0;
...@@ -682,10 +772,10 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC ...@@ -682,10 +772,10 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
else else
{ {
errStringXml = new StringBuffer(""); errStringXml = new StringBuffer("");
} }*/
}catch (Exception e) }catch (Exception e)
{ {
System.out.println("Exception :DeptIC :wfValData(Document,String):"+ e.getMessage() + ":"); System.out.println("Exception :HolChangeIC :wfValData(Document,String):"+ e.getMessage() + ":");
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
......
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