Skip to content

B
business-java
Commit ec563c38 authored by arawankar's avatar arawankar
Browse files
Options

Changed made to add connection parameter in nfCheckPeriod method. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@186067 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6180b10e
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 14 deletions
webitm-adm/ibase/webitm/ejb/adm/Form16Payment1.java
View file @ ec563c38
......@@ -248,7 +248,10 @@ public class Form16Payment1 extends ValidatorEJB implements Form16Payment1Local,
dtPymt = sdf.parse(datePayment);
System.out.println("dtPymt ::: " + dtPymt);
errString = nfCheckPeriod("ADM",dtPymt, siteCode);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errString = nfCheckPeriod("ADM",dtPymt, siteCode);
errString = nfCheckPeriod("ADM",dtPymt, siteCode , conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
System.out.println("errstring from nfcheckperiod :::: " + errString);
}
}
......
webitm-adm/ibase/webitm/ejb/adm/PayRollVoucPrc.java
View file @ ec563c38
......@@ -1792,7 +1792,7 @@ public String [] saveXmlData(String xmlString, String userId, String siteCode)th
ctx = new InitialContext(appConnect.getProperty());
MasterStatefulLocal masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStateful/local");
//MasterStateful masterStateful = masterStatefulHome.create();
retString = masterStateful.processRequest(new String[]{userId,password}, siteCode, true, xmlString);
retString = masterStateful.processRequest(new String[]{userId,password}, siteCode, true, xmlString, false, conn);
System.out.println("Return String in Miscvoucher 1" + retString+"****");
retArr = parse(retString);
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimIC.java
View file @ ec563c38
......@@ -274,10 +274,16 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
{
acctSite = paySite;
}
String errCode1 = nfCheckPeriod("ADM",claimDate,acctSite);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//String errCode1 = nfCheckPeriod("ADM",claimDate,acctSite);
String errCode1 = nfCheckPeriod("ADM",claimDate,acctSite,conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode1 == null || errCode1.trim().length() == 0)
{
errCode1 = nfCheckPeriod("FIN",claimDate,acctSite);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode1 = nfCheckPeriod("FIN",claimDate,acctSite);
errCode1 = nfCheckPeriod("FIN",claimDate,acctSite,conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
}
if (errCode1 != null && errCode1.trim().length() > 0)
{
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimPos.java
View file @ ec563c38
......@@ -1295,10 +1295,16 @@ public class PerkClaimPos extends ValidatorEJB implements PerkClaimPosLocal, Per
}*/
totalAmtbc = totalAmt*exchRate;
errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"));
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"));
errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"),conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode == null || errCode.trim().length() == 0)
{
errCode = nfCheckPeriod("FIN",tranDate,(String)payHdr.get("site_code"));
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = nfCheckPeriod("FIN",tranDate,(String)payHdr.get("site_code"));
errCode = nfCheckPeriod("FIN",tranDate,(String)payHdr.get("site_code"),conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode != null && errCode.trim().length() > 0)
{
errString = itmDBAccess.getErrorString("",errCode,"","",conn);
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimProcess.java
View file @ ec563c38
......@@ -1938,12 +1938,18 @@ public class PerkClaimProcess extends ValidatorEJB implements
//Modified by Ahmed on 14/Apr/2017[start]
SimpleDateFormat sdfAppl = new SimpleDateFormat(getApplDateFormat());
Date tranDate = sdfAppl.parse(claimDate);
errCode = nfCheckPeriod("ADM", tranDate, paySite);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = nfCheckPeriod("ADM", tranDate, paySite);
errCode = nfCheckPeriod("ADM", tranDate, paySite,conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
System.out.println("paySite::ADM::" + paySite);
System.out.println("errCode::ADM::" + errCode);
if(errCode == null || errCode.trim().length() == 0)
{
errCode = nfCheckPeriod("FIN", tranDate, paySite);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = nfCheckPeriod("FIN", tranDate, paySite);
errCode = nfCheckPeriod("FIN", tranDate, paySite,conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
System.out.println("errCode::FIN::" + errCode);
if(errCode != null && errCode.trim().length() > 0)
{
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimProcessComm.java
View file @ ec563c38
......@@ -1071,11 +1071,16 @@ public class PerkClaimProcessComm extends ValidatorEJB implements PerkClaimProce
return errString;
}*/
totalAmtbc = totalAmt*exchRate;
errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"));
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"));
errCode = nfCheckPeriod("ADM",tranDate,(String)payHdr.get("site_code"),conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode == null || errCode.trim().length() == 0)
{
errCode = nfCheckPeriod("FIN",tranDate,(String)payHdr.get("site_code"));
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = nfCheckPeriod("FIN",tranDate,(String)payHdr.get("site_code"));
errCode = nfCheckPeriod("FIN",tranDate,(String)payHdr.get("site_code"),conn);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode != null && errCode.trim().length() > 0)
{
errString = itmDBAccess.getErrorString("",errCode,"","",conn);
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpMaritalStatusConf.java
View file @ ec563c38
......@@ -325,11 +325,16 @@ public class EmpMaritalStatusConf extends ActionHandlerEJB implements EmpMarital
return retString;
}
}
errCode = validator.nfCheckPeriod("ADM", tranDateSql, paySite);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = validator.nfCheckPeriod("ADM", tranDateSql, paySite);
errCode = validator.nfCheckPeriod("ADM", tranDateSql, paySite,connection);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode == null || errCode.trim().length() == 0)
{
errCode = validator.nfCheckPeriod("FIN", tranDateSql, paySite);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][Start]
//errCode = validator.nfCheckPeriod("FIN", tranDateSql, paySite);
errCode = validator.nfCheckPeriod("FIN", tranDateSql, paySite,connection);
//Modified by Anjali R. on[06/06/2018][To add connection parameter in nfCheckPeriod method][End]
if(errCode != null && errCode.trim().length() > 0)
{
retString = itmDBAccess.getErrorString("", errCode, "", "", connection);
......
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