Skip to content

B
business-java
Commit 40f58f4a authored by ysawant's avatar ysawant
Browse files
Options

*Updated components of AutoLeaveLaps and LeaveOpenBalancePrc 

AutoLeaveLapsIC.java
LeaveOpenBalancePrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215518 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dddcc44d
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 66 deletions
webitm-adm/src/ibase/webitm/ejb/adm/AutoLeaveLapsIC.java
View file @ 40f58f4a
...@@ -70,27 +70,27 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca ...@@ -70,27 +70,27 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca
String sql = ""; String sql = "";
UtilMethods utilmethod=new UtilMethods(); UtilMethods utilmethod=new UtilMethods();
String userId=""; String userId = "";
String loginSite=""; String loginSite = "";
String prdCode=""; String prdCode = "";
int mLevel=0; int mLevel = 0;
String todaydate= ""; String todaydate = "";
String lsDescr=""; String lsDescr = "";
String rights=""; String rights = "";
String empCodeFr=""; String empCodeFr = "";
String empFname=""; String empFname = "";
String empLname=""; String empLname = "";
String modStr=""; String modStr = "";
String profileId=""; String profileId = "";
String empCodeTo=""; String empCodeTo = "";
String deptCodeFr=""; String deptCodeFr = "";
String deptCodeTo=""; String deptCodeTo = "";
String siteCodeFr=""; String siteCodeFr = "";
String siteCodeTo=""; String siteCodeTo = "";
String lveCodeFr=""; String lveCodeFr = "";
String lveCodeTo=""; String lveCodeTo = "";
String procGroupFr=""; String procGroupFr = "";
String procGroupTo=""; String procGroupTo = "";
try try
{ {
...@@ -619,10 +619,9 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca ...@@ -619,10 +619,9 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>(); ArrayList<String> errFields = new ArrayList<String>();
String errorType=""; String errorType="";
errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); //errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
E12GenericUtility genericUtility = null; E12GenericUtility genericUtility = null;
UtilMethods utilmethod=new UtilMethods(); UtilMethods utilmethod=new UtilMethods();
try try
{ {
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
...@@ -745,48 +744,48 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca ...@@ -745,48 +744,48 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca
break; break;
} }
} }
} }
} }
} }
if (errList != null && errList.size() > 0) }
if (errList != null && errList.size() > 0)
{
errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
System.out.println("errList==[" + errList + "]");
int errListSize = errList.size();
System.out.println("errListSize:::::::[" + errListSize + "]");
System.out.println("in error::::::::::");
for (int i = 0; i < errListSize; i++)
{ {
System.out.println("errList==[" + errList + "]"); System.out.println("in error For:::::::::::::::");
int errListSize = errList.size(); String errCode = (String) errList.get(i);
System.out.println("errListSize:::::::[" + errListSize + "]"); String errFldName = (String) errFields.get(i);
System.out.println("in error::::::::::"); System.out.println("errCode .........." + errCode);
for (int i = 0; i < errListSize; i++) errString = itmDbAcess.getErrorString(errFldName, errCode, userId, "", conn);
{ System.out.println("errString is : ::::>>>> " + errString);
System.out.println("in error For:::::::::::::::"); String msgType = errorType(conn, errCode);
String errCode = (String) errList.get(i); if (errString.length() > 0)
String errFldName = (String) errFields.get(i); {
System.out.println("errCode .........." + errCode); String bifurErrString = errString.substring(errString.indexOf("<Errors>") + 8,errString.indexOf("<trace>"));
errString = itmDbAcess.getErrorString(errFldName, errCode, userId, "", conn); bifurErrString = bifurErrString + errString.substring(errString.indexOf("</trace>") + 8,errString.indexOf("</Errors>"));
System.out.println("errString is : ::::>>>> " + errString); errStringXml.append(bifurErrString);
String msgType = errorType(conn, errCode); System.out.println("errStringXml .........." + errStringXml);
if (errString.length() > 0) errString = "";
{ }
String bifurErrString = errString.substring(errString.indexOf("<Errors>") + 8,errString.indexOf("<trace>")); if (msgType.equalsIgnoreCase("E"))
bifurErrString = bifurErrString + errString.substring(errString.indexOf("</trace>") + 8,errString.indexOf("</Errors>")); {
errStringXml.append(bifurErrString); break;
System.out.println("errStringXml .........." + errStringXml);
errString = "";
}
if (msgType.equalsIgnoreCase("E"))
{
break;
}
} }
errList.clear();
errFields.clear();
errStringXml.append("</Errors></Root>\r\n");
}
else
{
errStringXml = new StringBuffer("");
} }
System.out.println("errStringXml.toString()---2= "+errStringXml.toString()); errList.clear();
errFields.clear();
errStringXml.append("</Errors></Root>\r\n");
}
else
{
errStringXml = new StringBuffer("");
} }
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -820,6 +819,7 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca ...@@ -820,6 +819,7 @@ public class AutoLeaveLapsIC extends ValidatorEJB implements AutoLeaveLapsICLoca
throw new ITMException(e); throw new ITMException(e);
} }
} }
System.out.println("errStringXml.toString()>= "+errStringXml.toString());
errString = errStringXml.toString(); errString = errStringXml.toString();
return errString; return errString;
} }
......
webitm-adm/src/ibase/webitm/ejb/adm/EmpAddChange.java
View file @ 40f58f4a
...@@ -905,7 +905,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -905,7 +905,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
valueXmlString.append("<cur_state protect=\"1\"><![CDATA[").append(lsCurrentState).append("]]></cur_state>\r\n"); valueXmlString.append("<cur_state ><![CDATA[").append(lsCurrentState).append("]]></cur_state>\r\n");
} }
if ("per_city".equalsIgnoreCase(currentColumn)) if ("per_city".equalsIgnoreCase(currentColumn))
...@@ -933,7 +933,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -933,7 +933,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
valueXmlString.append("<per_state protect=\"1\"><![CDATA[").append(lsPermanantState).append("]]></per_state>\r\n"); valueXmlString.append("<per_state ><![CDATA[").append(lsPermanantState).append("]]></per_state>\r\n");
} }
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
......
webitm-adm/src/ibase/webitm/ejb/adm/LeaveOpenBalancePrc.java
View file @ 40f58f4a
...@@ -6,6 +6,7 @@ import java.sql.Date; ...@@ -6,6 +6,7 @@ import java.sql.Date;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -163,6 +164,8 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -163,6 +164,8 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
logWriter.setProcessId("LeaveOpenBalance"); logWriter.setProcessId("LeaveOpenBalance");
logWriter.setFileNameStartWith(""); logWriter.setFileNameStartWith("");
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
currentProcess = logWriter.getCurrentProcess(); currentProcess = logWriter.getCurrentProcess();
activity = logWriter.getActivity(); activity = logWriter.getActivity();
processId = logWriter.getProcessId(); processId = logWriter.getProcessId();
...@@ -223,8 +226,11 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -223,8 +226,11 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
} }
procDate = checkNull(genericUtility.getColumnValue("proc_date", headerDom)); procDate = checkNull(genericUtility.getColumnValue("proc_date", headerDom));
ldProcess = Timestamp.valueOf(genericUtility.getValidDateString(procDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); if(procDate != null && procDate.trim().length() > 0)
{
ldProcess = Timestamp.valueOf(genericUtility.getValidDateString(procDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
procGroupFr = checkNull(genericUtility.getColumnValue("proc_group__fr", headerDom)); procGroupFr = checkNull(genericUtility.getColumnValue("proc_group__fr", headerDom));
procGroupTo = checkNull(genericUtility.getColumnValue("proc_group__to", headerDom)); procGroupTo = checkNull(genericUtility.getColumnValue("proc_group__to", headerDom));
if((procGroupFr.trim()) == null) if((procGroupFr.trim()) == null)
...@@ -376,6 +382,10 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -376,6 +382,10 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
} }
} }
System.out.println("lsEmpCode ==["+lsEmpCode+"]");
System.out.println("ldProcess ==["+ldProcess+"]");
System.out.println("lsLveCode ==["+lsLveCode+"]");
pstmt2.setString(1,lsEmpCode); pstmt2.setString(1,lsEmpCode);
pstmt2.setTimestamp(2, ldProcess); pstmt2.setTimestamp(2, ldProcess);
pstmt2.setTimestamp(3, ldProcess); pstmt2.setTimestamp(3, ldProcess);
...@@ -386,6 +396,7 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -386,6 +396,7 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
pstmt2.setTimestamp(8, ldProcess); pstmt2.setTimestamp(8, ldProcess);
pstmt2.setTimestamp(9, ldProcess); pstmt2.setTimestamp(9, ldProcess);
pstmt2.setString(10,lsLveCode); pstmt2.setString(10,lsLveCode);
rs2 = pstmt2.executeQuery(); rs2 = pstmt2.executeQuery();
if (rs2.next()) if (rs2.next())
{ {
...@@ -405,12 +416,13 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -405,12 +416,13 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
} }
rs2.close(); rs2.close();
pstmt2.clearParameters(); pstmt2.clearParameters();
//
frDate = utilMethod.dateTime(utilMethod.today()); frDate = utilMethod.dateTime(utilMethod.today());
System.out.println("frDate::::::::::::"+frDate); System.out.println("frDate::::::::::::"+frDate);
frDateStr = genericUtility.getValidDateTimeString(frDate, genericUtility.getApplDateFormat()); frDateStr = genericUtility.getValidDateTimeString(frDate, genericUtility.getApplDateFormat());
System.out.println("frDateStr::::::::::::"+frDateStr); System.out.println("frDateStr::::::::::::"+frDateStr);
Timestamp ldProcTs = new Timestamp(ldProc.getTime()); Timestamp ldProcTs = new Timestamp(ldProc.getTime());
System.out.println("ldProcTs = "+ldProcTs); System.out.println("ldProcTs = "+ldProcTs);
...@@ -422,10 +434,13 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -422,10 +434,13 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
{ {
ldEffDate = rs3.getTimestamp("eff_date"); ldEffDate = rs3.getTimestamp("eff_date");
ldUptoDate = rs3.getTimestamp("upto_date"); ldUptoDate = rs3.getTimestamp("upto_date");
System.out.println("ldEffDate == "+ldEffDate);
System.out.println("upto_date == "+ldUptoDate);
} }
rs3.close(); rs3.close();
pstmt3.clearParameters(); pstmt3.clearParameters();
//
rs4 = pstmt4.executeQuery(); rs4 = pstmt4.executeQuery();
if (rs4.next()) if (rs4.next())
...@@ -469,7 +484,6 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -469,7 +484,6 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
return errString; return errString;
//break; //break;
} }
//
pstmt5.setString(1,lsEmpCode); pstmt5.setString(1,lsEmpCode);
pstmt5.setString(2,lsLveCode); pstmt5.setString(2,lsLveCode);
...@@ -485,7 +499,18 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP ...@@ -485,7 +499,18 @@ public class LeaveOpenBalancePrc extends ProcessEJB implements LeaveOpenBalanceP
conn.rollback(); conn.rollback();
break; break;
} }
//
System.out.println("tranId -->"+tranId);
System.out.println("lsEmpCode -->"+lsEmpCode);
System.out.println("frDate -->"+frDate);
System.out.println("lsLveCode -->"+lsLveCode);
System.out.println("ldEffDate -->"+ldEffDate);
System.out.println("ldUptoDate -->"+ldUptoDate);
System.out.println("lcPrevBal -->"+lcPrevBal);
System.out.println("frDate -->"+frDate);
System.out.println("userId -->"+userId);
System.out.println("termId -->"+termId);
pstmt6.setString(1,tranId); pstmt6.setString(1,tranId);
pstmt6.setString(2,lsEmpCode); pstmt6.setString(2,lsEmpCode);
......
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