Skip to content

B
business-java
Commit fc889a59 authored by piyush's avatar piyush
Browse files
Options

Modified to resolve cancel remarks related issue in mail sent on rejection 

1) PayStruChgReqSubmit.java
2) PayStruChgReqReject.java

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217373 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fc26274b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 366 additions and 266 deletions
webitm-adm/.classpath
View file @ fc889a59
This diff is collapsed.
webitm-adm/src/ibase/webitm/ejb/adm/adv/PayStruChgReqReject.java
View file @ fc889a59
......@@ -139,6 +139,8 @@ public class PayStruChgReqReject extends ActionHandlerEJB implements PayStruChgR
transInfoXml = "";
}
// Modified by Piyush on 02/03/2020 [To call overloaded actionhandler method with transinfo xml].Start
/*
retString = postLogic(tranId, xtraParams, forcedFlag, conn);
System.out.println("retString from PayStruChgReqReject : postLogic(tranId, xtraParams, forcedFlag, conn); : "+retString);
......@@ -163,6 +165,78 @@ public class PayStruChgReqReject extends ActionHandlerEJB implements PayStruChgR
}
retString = itmDbAcess.getErrorString("","VTPAYALC19" , userId, "", conn);
}
*/
retString = actionHandler(tranId, xtraParams, forcedFlag, transInfoXml, conn);
// Modified by Piyush on 02/03/2020 [To call overloaded actionhandler method with transinfo xml].End
}
catch(Exception e)
{
try
{
if (conn != null)
{
conn.rollback();
}
}
catch (Exception e3)
{
System.out.println("Exception :PayStruChgReqReject : actionHandler(String tranId, String xtraParams, String forcedFlag, Connection conn) :" + e3.getMessage() + ":");
e3.printStackTrace();
}
System.out.println("Exception :PayStruChgReqReject : actionHandler(String tranId, String xtraParams, String forcedFlag, Connection conn) :" + e.getMessage() + ":");
retString = genericUtility.createErrorString(e);
e.printStackTrace();
}
finally
{
}
return retString;
}
// Modified by Piyush on 02/03/2020 [Crearted overloaded method to pass transinfo xml].Start
public String actionHandler(String tranId, String xtraParams, String forcedFlag, String transInfoXml, Connection conn)
{
String retString = "";
String userId = "";
String userInfoStr = "";
UserInfoBean userInfoBean = null;
DBAccessEJB dbAccessEJB = new DBAccessEJB();
PayStruChgReqConfirm payStruChgReqConfirm = new PayStruChgReqConfirm();
try
{
System.out.println(":::Inside PayStruChgReqReject : actionHandler(String tranId, String xtraParams, String forcedFlag, Connection conn):::");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
retString = postLogic(tranId, xtraParams, forcedFlag, conn);
System.out.println("retString from PayStruChgReqReject : postLogic(tranId, xtraParams, forcedFlag, conn); : "+retString);
if(retString != null && retString.trim().length() > 0 && retString.indexOf("VTPAYALC19")<0)
{
conn.rollback();
}
else
{
conn.commit();
if (transInfoXml != null && transInfoXml.trim().length() > 0)
{
try
{
userInfoBean = payStruChgReqConfirm.createUserInfo(userId, null, conn);
userInfoStr = userInfoBean.toString();
payStruChgReqConfirm.doMailActivity(tranId , transInfoXml, userInfoStr, "PYALCREJ01", "EMP", "HR", xtraParams, conn);
}
catch (Exception e2)
{
System.out.println("Exception :payStruChgReqConfirm :doMailActivity(tranId , transInfoXml, userInfoStr, \"PYALCREJ01\", \"EMP\", \"HR\", xtraParams, conn);:" + e2.getMessage() + ":");
e2.printStackTrace();
}
}
retString = itmDbAcess.getErrorString("","VTPAYALC19" , userId, "", conn);
}
}
catch(Exception e)
{
......@@ -188,6 +262,7 @@ public class PayStruChgReqReject extends ActionHandlerEJB implements PayStruChgR
}
return retString;
}
// Modified by Piyush on 02/03/2020 [Crearted overloaded method to pass transinfo xml].End
@SuppressWarnings("resource")
......
webitm-adm/src/ibase/webitm/ejb/adm/adv/PayStruChgReqSubmit.java
View file @ fc889a59
......@@ -72,7 +72,9 @@ public class PayStruChgReqSubmit extends ValidatorEJB implements PayStruChgReqSu
if (objName != null && (objName.equalsIgnoreCase("pay_stru_chg_req_hr") || objName.equalsIgnoreCase("pay_stru_chg_req_hr_wiz")))
{
errString = performHrAction(dom, Tranid, forcedFlag, xtraParams, conn);
// Modified by Piyush on 02/03/2020 [To pass transinfo xml]
// errString = performHrAction(dom, Tranid, forcedFlag, xtraParams, conn);
errString = performHrAction(dom, Tranid, forcedFlag, xtraParams, xmlString, conn);
return errString;
}
if (empCode == null || empCode.trim().length() == 0)
......@@ -375,7 +377,9 @@ public class PayStruChgReqSubmit extends ValidatorEJB implements PayStruChgReqSu
return objName;
}
private String performHrAction(Document dom, String Tranid, String forcedFlag, String xtraParams, Connection conn) throws ITMException
// Modified by Piyush on 02/03/2020 [To pass transinfo xml]
// private String performHrAction(Document dom, String Tranid, String forcedFlag, String xtraParams, Connection conn) throws ITMException
private String performHrAction(Document dom, String Tranid, String forcedFlag, String xtraParams, String transInfoXml, Connection conn) throws ITMException
{
String cancelRemarks = "";
String hrAction = "";
......@@ -399,11 +403,13 @@ public class PayStruChgReqSubmit extends ValidatorEJB implements PayStruChgReqSu
}
else if (hrAction.trim().equalsIgnoreCase("R"))
{
// Modified by Piyush on 02/03/2020 [To pass transinfo xml]
// returnString = payStruChgReqReject.actionHandler(Tranid, forcedFlag, xtraParams, conn);
returnString = payStruChgReqReject.actionHandler(Tranid, forcedFlag, xtraParams, conn);
}
else if (hrAction.trim().equalsIgnoreCase("C"))
{
returnString = payStruChgReqReject.actionHandler(Tranid, forcedFlag, xtraParams, conn);
returnString = payStruChgReqReject.actionHandler(Tranid, forcedFlag, xtraParams, transInfoXml, conn);
}
}
catch (Exception 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