Skip to content

B
business-java
Commit 07930f66 authored by ysawant's avatar ysawant
Browse files
Options

*Added updated components of employee address change [10-01-2020] 

EmpAddChangeConfirm.java
EmpAddChange.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214928 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1d3073b6
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 63 deletions
webitm-adm/src/ibase/webitm/ejb/adm/EmpAddChange.java
View file @ 07930f66
...@@ -612,11 +612,13 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -612,11 +612,13 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
valueXmlString.append("<Detail1>\r\n"); valueXmlString.append("<Detail1>\r\n");
if ("itm_defaultedit".equalsIgnoreCase(currentColumn)) if ("itm_defaultedit".equalsIgnoreCase(currentColumn))
{ {
System.out.println("====================itm default edit================"); System.out.println("@@====================itm default edit================@@");
lsTranId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "tran_id"); lsTranId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "tran_id");
if(lsTranId == null || lsTranId.trim().length() == 0) if(lsTranId == null || lsTranId.trim().length() == 0)
{ {
lsTranId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "as_tran_id"); lsTranId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "as_tran_id");
if(lsTranId == null || lsTranId.trim().length() == 0) if(lsTranId == null || lsTranId.trim().length() == 0)
{ {
lsTranId=checkNull(genericUtility.getColumnValue("tran_id", dom)); lsTranId=checkNull(genericUtility.getColumnValue("tran_id", dom));
...@@ -645,6 +647,8 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -645,6 +647,8 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("lsConf --->"+lsConf);
if("N".equalsIgnoreCase(lsConf)) if("N".equalsIgnoreCase(lsConf))
{ {
empCode=checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode=checkNull(genericUtility.getColumnValue("emp_code", dom));
...@@ -737,6 +741,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -737,6 +741,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
{ {
System.out.println(":::Inside if :::"); System.out.println(":::Inside if :::");
//Modified by Yashwant on 05-11-19[Start]
sql="select emp_fname, emp_mname, emp_lname, designation," + sql="select emp_fname, emp_mname, emp_lname, designation," +
" cur_add1, cur_add2, cur_add3, cur_city," + " cur_add1, cur_add2, cur_add3, cur_city," +
" cur_state, cur_pin, cur_tel1, cur_tel2," + " cur_state, cur_pin, cur_tel1, cur_tel2," +
...@@ -750,6 +755,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -750,6 +755,7 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
pstmt.setString(1, lsEmpCode); pstmt.setString(1, lsEmpCode);
//pstmt.setInt(2, mLevl); //pstmt.setInt(2, mLevl);
//pstmt.setString(3, loginSiteCode); //pstmt.setString(3, loginSiteCode);
//Modified by Yashwant on 05-11-19[End]
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -878,11 +884,12 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -878,11 +884,12 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
{ {
System.out.println("====================cur_city================"); System.out.println("====================cur_city================");
lsCurCity=checkNull(genericUtility.getColumnValue("cur_city", dom)); lsCurCity = checkNull(genericUtility.getColumnValue("cur_city", dom));
System.out.println("lsCurCity --["+lsCurCity+"]");
sql="select state_code from station where sh_descr = ?"; sql="select state_code from station where sh_descr = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCurCity); pstmt.setString(1, lsCurCity.trim());
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -899,7 +906,6 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -899,7 +906,6 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
pstmt = null; pstmt = null;
} }
valueXmlString.append("<cur_state protect=\"1\"><![CDATA[").append(lsCurrentState).append("]]></cur_state>\r\n"); valueXmlString.append("<cur_state protect=\"1\"><![CDATA[").append(lsCurrentState).append("]]></cur_state>\r\n");
} }
if ("per_city".equalsIgnoreCase(currentColumn)) if ("per_city".equalsIgnoreCase(currentColumn))
...@@ -907,10 +913,11 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -907,10 +913,11 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
System.out.println("====================per_city================"); System.out.println("====================per_city================");
lsPermanantCity=checkNull(genericUtility.getColumnValue("per_city", dom)); lsPermanantCity=checkNull(genericUtility.getColumnValue("per_city", dom));
System.out.println("lsPermanantCity --["+lsPermanantCity+"]");
sql="select state_code from station where sh_descr = ?"; sql="select state_code from station where sh_descr = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsPermanantCity); pstmt.setString(1, lsPermanantCity.trim());
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -1044,6 +1051,6 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA ...@@ -1044,6 +1051,6 @@ public class EmpAddChange extends ValidatorEJB implements EmpAddChangeLocal,EmpA
{ {
input = ""; input = "";
} }
return input; return input.trim();
} }
} }
webitm-adm/src/ibase/webitm/ejb/adm/adv/EmpAddChangeConfirm.java
View file @ 07930f66
//Migrated By Yashwant on 19/07/2019[Start]
package ibase.webitm.ejb.adm.adv; package ibase.webitm.ejb.adm.adv;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -19,13 +18,19 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -19,13 +18,19 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException
{ {
String retString = ""; String retString = "";
ITMDBAccessEJB itmDbAcess = new ITMDBAccessEJB();
E12GenericUtility genericUtility = new E12GenericUtility();
Connection conn=null; Connection conn=null;
String userId = "";
try try
{ {
System.out.println(":::Inside EmpAddChangeConfirm : confirm():::"); System.out.println(":::Inside EmpAddChangeConfirm : confirm():::");
conn= getConnection(); conn= getConnection();
retString=postLogic(tranId, tranId, xtraParams, forcedFlag, conn);
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
retString = postLogic(tranId, tranId, xtraParams, forcedFlag, conn);
System.out.println("retString from postLogic : "+retString); System.out.println("retString from postLogic : "+retString);
if(retString != null && retString.trim().length() > 0) if(retString != null && retString.trim().length() > 0)
{ {
conn.rollback(); conn.rollback();
...@@ -33,6 +38,8 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -33,6 +38,8 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
else else
{ {
conn.commit(); conn.commit();
retString = itmDbAcess.getErrorString("","ADCHGSUCC" , userId, "", conn);
return retString;
} }
} }
catch(Exception e) catch(Exception e)
...@@ -62,15 +69,15 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -62,15 +69,15 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
public String postLogic(String asTranidFr,String asTranidTo,String xtraParams,String forcedFlag,Connection conn) throws ITMException public String postLogic(String asTranidFr,String asTranidTo,String xtraParams,String forcedFlag,Connection conn) throws ITMException
{ {
String lsTranId=""; String lsTranId = "";
String lsConf=""; String lsConf = "";
String sql=""; String sql = "";
ResultSet rs=null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ITMDBAccessEJB itmDbAcess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDbAcess = new ITMDBAccessEJB();
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
String errString=""; String errString = "";
String userId=""; String userId = "";
try try
{ {
System.out.println(":::Inside EmpAddChangeConfirm : postLogic():::"); System.out.println(":::Inside EmpAddChangeConfirm : postLogic():::");
...@@ -120,7 +127,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -120,7 +127,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
} }
else else
{ {
errString=gbfUpdation(lsTranId, "Y", xtraParams, conn); errString = gbfUpdation(lsTranId, "Y", xtraParams, conn);
} }
} }
catch (Exception e) catch (Exception e)
...@@ -128,6 +135,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -128,6 +135,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
System.out.println("errString inside postLogic -->"+errString);
return errString; return errString;
} }
...@@ -136,43 +144,42 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -136,43 +144,42 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
{ {
System.out.println("--------------gbfUpdation method of EmpAddChangeConfirm -------------"); System.out.println("--------------gbfUpdation method of EmpAddChangeConfirm -------------");
ResultSet rs=null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
E12GenericUtility genericUtility=new E12GenericUtility(); String sql = "";
String sql=""; String empCode = "";
String curAdd1 = "";
String empCode=""; String curAdd2 = "";
String curAdd1=""; String curAdd3 = "";
String curAdd2=""; String curCity = "";
String curAdd3=""; String curPin = "";
String curCity=""; String curTel1 = "";
String curPin=""; String curTel2 = "";
String curTel1=""; String curTel3 = "";
String curTel2=""; String curState = "";
String curTel3=""; String perAdd1 = "";
String curState=""; String perAdd2 = "";
String perAdd1=""; String perAdd3 = "";
String perAdd2=""; String perCity = "";
String perAdd3=""; String perState = "";
String perCity=""; String perPin = "";
String perState=""; String perTel = "";
String perPin=""; String mobileNo = "";
String perTel=""; String smsDomain = "";
String mobileNo=""; String emailIdOff = "";
String smsDomain=""; String emailIdPer = "";
String emailIdOff=""; String imeNo = "";
String emailIdPer=""; String userId = "";
String imeNo=""; String errString = "";
String userId=""; String termId = "";
String errString=""; String confDate = "";
String termId=""; String empCodeAprv = "";
String confDate=""; Timestamp chgDate = null;
String empCodeAprv=""; Timestamp ldConfDate = null;
Timestamp chgDate=null; String todayDate = "";
Timestamp ldConfDate=null;
SimpleDateFormat sdf=null; SimpleDateFormat sdf = null;
String todayDate=""; E12GenericUtility genericUtility = new E12GenericUtility();
ITMDBAccessEJB itmDbAcess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDbAcess = new ITMDBAccessEJB();
try try
...@@ -204,7 +211,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -204,7 +211,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
curAdd2 = checkNull(rs.getString("cur_add2")); curAdd2 = checkNull(rs.getString("cur_add2"));
curAdd3 = checkNull(rs.getString("cur_add3")); curAdd3 = checkNull(rs.getString("cur_add3"));
curCity = checkNull(rs.getString("cur_city")); curCity = checkNull(rs.getString("cur_city"));
curState=checkNull(rs.getString("cur_state")); curState = checkNull(rs.getString("cur_state"));
curPin = checkNull(rs.getString("cur_pin")); curPin = checkNull(rs.getString("cur_pin"));
curTel1 = checkNull(rs.getString("cur_tel1")); curTel1 = checkNull(rs.getString("cur_tel1"));
curTel2 = checkNull(rs.getString("cur_tel2")); curTel2 = checkNull(rs.getString("cur_tel2"));
...@@ -226,7 +233,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -226,7 +233,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
} }
else else
{ {
errString=checkNull(itmDbAcess.getErrorString("", "DS000", userId, "", conn)); errString = checkNull(itmDbAcess.getErrorString("", "DS000", userId, "", conn));
break; break;
} }
if (rs != null) if (rs != null)
...@@ -257,7 +264,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -257,7 +264,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
} }
if(count != 1) if(count != 1)
{ {
errString=itmDbAcess.getErrorString("","DS000NR" , userId, "", conn); errString = itmDbAcess.getErrorString("","DS000NR" , userId, "", conn);
break; break;
} }
System.out.println("confirm updated -------->>>>>>>>>updCount :"+count); System.out.println("confirm updated -------->>>>>>>>>updCount :"+count);
...@@ -302,16 +309,11 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -302,16 +309,11 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Added Validation to show Successful Msg [Start] System.out.println("Employee update count -->"+count);
if(count > 0)
{
errString=itmDbAcess.getErrorString("","ADCHGSUCC" , userId, "", conn);
break;
}
//Added Validation to show Successful Msg [End]
if(count != 1) if(count != 1)
{ {
errString=itmDbAcess.getErrorString("","DS000NR" , userId, "", conn); errString = itmDbAcess.getErrorString("","DS000NR" , userId, "", conn);
break; break;
} }
break; break;
...@@ -346,6 +348,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -346,6 +348,7 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
throw new ITMException(e); throw new ITMException(e);
} }
} }
return errString; return errString;
} }
...@@ -362,5 +365,4 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang ...@@ -362,5 +365,4 @@ public class EmpAddChangeConfirm extends ActionHandlerEJB implements EmpAddChang
return input; return input;
} }
} }
//Migrated By Yashwant on 19/07/2019[End]
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