Skip to content

B
business-java
Commit cf3f52d6 authored by rtiwari's avatar rtiwari
Browse files
Options

UPDATED 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95001 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0bb1c19a
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 19 deletions
webitm-dis/ibase/webitm/ejb/dis/EmpTravelInfoIC.java
View file @ cf3f52d6
...@@ -14,6 +14,7 @@ import java.rmi.RemoteException; ...@@ -14,6 +14,7 @@ import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
...@@ -167,18 +168,18 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca ...@@ -167,18 +168,18 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca
} }
} }
if (childNodeName.equalsIgnoreCase("tran_id")) // if (childNodeName.equalsIgnoreCase("tran_id"))
{ // {
tranId= genericUtility.getColumnValue("tran_id", dom); // tranId= genericUtility.getColumnValue("tran_id", dom);
System.out.println(" tran_id :: received ["+tranId +"]"); // System.out.println(" tran_id :: received ["+tranId +"]");
if (tranId == null || tranId.trim().length() == 0) // if (tranId == null || tranId.trim().length() == 0)
{ // {
errCode = "VTTRANNL1"; // errCode = "VTTRANNL1";
errList.add(errCode); // errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); // errFields.add(childNodeName.toLowerCase());
System.out.println(" passportNo not valid :"+passportNo); // System.out.println(" passportNo not valid :"+passportNo);
} // }
} // }
if (childNodeName.equalsIgnoreCase("item_ser")) if (childNodeName.equalsIgnoreCase("item_ser"))
{ {
...@@ -388,6 +389,45 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca ...@@ -388,6 +389,45 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca
System.out.println(" name_prefix not valid :"+title); System.out.println(" name_prefix not valid :"+title);
} }
} }
if (childNodeName.equalsIgnoreCase("date_of_issue"))
{
String dateOfIssueStr= genericUtility.getColumnValue("date_of_issue", dom);
System.out.println(" date_of_issue :: received ["+dateOfIssueStr +"]");
if (dateOfIssueStr == null || dateOfIssueStr.trim().length() == 0)
{
errCode = "VTVUPTO2";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
System.out.println(" date_of_issue not valid :"+dateOfIssueStr);
}
}
if (childNodeName.equalsIgnoreCase("valid_upto"))
{
String validUpToStr= genericUtility.getColumnValue("valid_upto", dom);
String dateOfIssueStr= genericUtility.getColumnValue("date_of_issue", dom);
System.out.println(" valid_upto :: received ["+validUpToStr +"]");
if (validUpToStr == null || validUpToStr.trim().length() == 0)
{
errCode = "VTVUPTO1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
System.out.println(" validUpToStr not valid :"+validUpToStr);
}
else if (dateOfIssueStr != null || dateOfIssueStr.trim().length() > 0)
{
Timestamp effDate = Timestamp.valueOf(genericUtility.getValidDateString(dateOfIssueStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
Timestamp validUpto = Timestamp.valueOf(genericUtility.getValidDateString(validUpToStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
if(validUpto != null && validUpto.before(effDate))
{
errCode = "VTVUPTO3";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
System.out.println(" validUpToStr not valid :"+validUpToStr);
}
}
}
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
...@@ -582,7 +622,7 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca ...@@ -582,7 +622,7 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca
sql = " select NAME_PREFIX,EMP_FNAME,EMP_MNAME,EMP_LNAME,DESIGNATION,REPORT_TO,EMAIL_ID_OFF, " + sql = " select NAME_PREFIX,EMP_FNAME,EMP_MNAME,EMP_LNAME,DESIGNATION,REPORT_TO,EMAIL_ID_OFF, " +
" PASSPORT_NO,DATE_OF_ISSUE,PLACE_OF_ISSUE,VALID_UPTO,BIRTH_PLACE,BIRTH_DATE, "+ " PASSPORT_NO,DATE_OF_ISSUE,PLACE_OF_ISSUE,VALID_UPTO,BIRTH_PLACE,BIRTH_DATE, "+
" PIN__PASS,POS_CODE,ADDR1__PASS,ADDR2__PASS,ADDR3__PASS,CITY__PASS,STATE_CODE__PASS,MOBILE_NO,CONTACT_TEL FROM EMPLOYEE WHERE EMP_CODE = ? "; " PIN__PASS,POS_CODE,CUR_ADD1,CUR_ADD2,CUR_ADD3,CITY__PASS,STATE_CODE__PASS,MOBILE_NO,CONTACT_TEL 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();
...@@ -603,9 +643,9 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca ...@@ -603,9 +643,9 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca
birthDate = rs.getTimestamp("BIRTH_DATE"); birthDate = rs.getTimestamp("BIRTH_DATE");
pinPass = rs.getString("PIN__PASS")==null?"": rs.getString("PIN__PASS"); pinPass = rs.getString("PIN__PASS")==null?"": rs.getString("PIN__PASS");
posCode = rs.getString("POS_CODE")==null?"": rs.getString("POS_CODE"); posCode = rs.getString("POS_CODE")==null?"": rs.getString("POS_CODE");
add1 = rs.getString("ADDR1__PASS")==null?"": rs.getString("ADDR1__PASS"); add1 = rs.getString("CUR_ADD1")==null?"": rs.getString("CUR_ADD1");
add2 = rs.getString("ADDR2__PASS")==null?"": rs.getString("ADDR2__PASS"); add2 = rs.getString("CUR_ADD2")==null?"": rs.getString("CUR_ADD2");
add3 = rs.getString("ADDR3__PASS")==null?"": rs.getString("ADDR3__PASS"); add3 = rs.getString("CUR_ADD3")==null?"": rs.getString("CUR_ADD3");
cityPass = rs.getString("CITY__PASS")==null?"": rs.getString("CITY__PASS"); cityPass = rs.getString("CITY__PASS")==null?"": rs.getString("CITY__PASS");
stateCodePass = rs.getString("STATE_CODE__PASS")==null?"": rs.getString("STATE_CODE__PASS"); stateCodePass = rs.getString("STATE_CODE__PASS")==null?"": rs.getString("STATE_CODE__PASS");
mobNo = rs.getString("MOBILE_NO")==null?"": rs.getString("MOBILE_NO"); mobNo = rs.getString("MOBILE_NO")==null?"": rs.getString("MOBILE_NO");
...@@ -689,13 +729,17 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca ...@@ -689,13 +729,17 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca
valueXmlString.append("<emp_mname>").append("<![CDATA["+ empMname +"]]>").append("</emp_mname>"); valueXmlString.append("<emp_mname>").append("<![CDATA["+ empMname +"]]>").append("</emp_mname>");
valueXmlString.append("<emp_lname>").append("<![CDATA["+ empLname +"]]>").append("</emp_lname>"); valueXmlString.append("<emp_lname>").append("<![CDATA["+ empLname +"]]>").append("</emp_lname>");
valueXmlString.append("<report_to>").append("<![CDATA["+ reportTo +"]]>").append("</report_to>"); valueXmlString.append("<report_to>").append("<![CDATA["+ reportTo +"]]>").append("</report_to>");
valueXmlString.append("<designation>").append("<![CDATA["+ desig +"]]>").append("</designation>"); //valueXmlString.append("<designation>").append("<![CDATA["+ desig +"]]>").append("</designation>");
valueXmlString.append("<birth_place>").append("<![CDATA["+ birthPlace +"]]>").append("</birth_place>"); valueXmlString.append("<birth_place>").append("<![CDATA["+ birthPlace +"]]>").append("</birth_place>");
if(birthDate!=null)
valueXmlString.append("<birth_date>").append("<![CDATA["+ sdf.format(birthDate).toString() +"]]>").append("</birth_date>"); valueXmlString.append("<birth_date>").append("<![CDATA["+ sdf.format(birthDate).toString() +"]]>").append("</birth_date>");
valueXmlString.append("<email_id>").append("<![CDATA["+ emailId +"]]>").append("</email_id>"); valueXmlString.append("<email_id>").append("<![CDATA["+ emailId +"]]>").append("</email_id>");
if(passNo!=null)
valueXmlString.append("<passport_no>").append("<![CDATA["+ passNo.trim() +"]]>").append("</passport_no>"); valueXmlString.append("<passport_no>").append("<![CDATA["+ passNo.trim() +"]]>").append("</passport_no>");
if(validUpTo!=null)
valueXmlString.append("<valid_upto>").append("<![CDATA["+ sdf.format(validUpTo).toString() +"]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto>").append("<![CDATA["+ sdf.format(validUpTo).toString() +"]]>").append("</valid_upto>");
valueXmlString.append("<place_of_issue>").append("<![CDATA["+ placeOfIss +"]]>").append("</place_of_issue>"); valueXmlString.append("<place_of_issue>").append("<![CDATA["+ placeOfIss +"]]>").append("</place_of_issue>");
if(dateOfIss!=null)
valueXmlString.append("<date_of_issue>").append("<![CDATA["+ sdf.format(dateOfIss).toString() +"]]>").append("</date_of_issue>"); valueXmlString.append("<date_of_issue>").append("<![CDATA["+ sdf.format(dateOfIss).toString() +"]]>").append("</date_of_issue>");
valueXmlString.append("<pin__pass>").append("<![CDATA["+ pinPass +"]]>").append("</pin__pass>"); valueXmlString.append("<pin__pass>").append("<![CDATA["+ pinPass +"]]>").append("</pin__pass>");
valueXmlString.append("<addr1__pass>").append("<![CDATA["+ add1 +"]]>").append("</addr1__pass>"); valueXmlString.append("<addr1__pass>").append("<![CDATA["+ add1 +"]]>").append("</addr1__pass>");
...@@ -737,7 +781,9 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca ...@@ -737,7 +781,9 @@ public class EmpTravelInfoIC extends ValidatorEJB implements EmpTravelInfoICLoca
valueXmlString.append("<emp_code__team_head>").append("<![CDATA["+ nsmCode +"]]>").append("</emp_code__team_head>"); valueXmlString.append("<emp_code__team_head>").append("<![CDATA["+ nsmCode +"]]>").append("</emp_code__team_head>");
valueXmlString.append("<descr>").append("<![CDATA["+ nsmName +"]]>").append("</descr>"); valueXmlString.append("<descr>").append("<![CDATA["+ nsmName +"]]>").append("</descr>");
valueXmlString.append("<group_code>").append("<![CDATA["+ grpCode +"]]>").append("</group_code>"); valueXmlString.append("<group_code>").append("<![CDATA["+ grpCode +"]]>").append("</group_code>");
if(travelDateTo!=null)
valueXmlString.append("<travel_date__to>").append("<![CDATA["+ sdf.format(travelDateTo) +"]]>").append("</travel_date__to>"); valueXmlString.append("<travel_date__to>").append("<![CDATA["+ sdf.format(travelDateTo) +"]]>").append("</travel_date__to>");
if(travelDateFrom!=null)
valueXmlString.append("<travel_date__from>").append("<![CDATA["+ sdf.format(travelDateFrom) +"]]>").append("</travel_date__from>"); valueXmlString.append("<travel_date__from>").append("<![CDATA["+ sdf.format(travelDateFrom) +"]]>").append("</travel_date__from>");
} }
......
webitm-dis/ibase/webitm/ejb/dis/adv/EmpInfoSubmit.java
View file @ cf3f52d6
...@@ -94,7 +94,7 @@ public class EmpInfoSubmit extends ActionHandlerEJB implements EmpInfoSubmitRemo ...@@ -94,7 +94,7 @@ public class EmpInfoSubmit extends ActionHandlerEJB implements EmpInfoSubmitRemo
} }
else else
{ {
sql = " update emp_travel_info set status = 'Y' where tran_id = ? "; sql = " update emp_travel_info set status = 'S' where tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
upd = pstmt.executeUpdate(); upd = pstmt.executeUpdate();
......
webitm-dis/ibase/webitm/ejb/dis/adv/EmpTravelInfoConf.java
View file @ cf3f52d6
...@@ -15,7 +15,6 @@ import java.sql.Connection; ...@@ -15,7 +15,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import javax.ejb.Stateless; import javax.ejb.Stateless;
@Stateless @Stateless
......
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