Commit b8db3e69 authored by pbhosale's avatar pbhosale

updated on[17-12-2016] as suggested by piyush sir

AllowDednSalComp.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213618 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5d595470
......@@ -892,16 +892,20 @@ public class AllowDednSalComp
exprsEngine.eval("function ISNULL(a) {return a==null?true:false}");
//Ended by Varsha V on 22-07-19
//Added by Varsha V on 02-12-19
exprsEngine.eval("function GF_GETENV(a,b) {var compName = Packages.ibase.webitm.ejb.adm.AllowDednSalComp;"
//Commented by Poonam B[16-12-2019][To avoid nullPointer][START]
/*exprsEngine.eval("function GF_GETENV(a,b) {var compName = Packages.ibase.webitm.ejb.adm.AllowDednSalComp;"
+ "var obj = new Packages.ibase.webitm.ejb.adm.AllowDednSalComp();"
+ "var res = obj.getEnv(a,b);"
+ "return res;}");
exprsEngine.eval("function GF_CALL_PYRL_DDF(a,b,c,d,e,f) {var compName = Packages.ibase.webitm.ejb.adm.AllowDednSalComp;"
+ "var obj = new Packages.ibase.webitm.ejb.adm.AllowDednSalComp();"
+ "var res = obj.gfCallPayrollDdf(a,b,c,d,e,f);"
+ "return res;}");
+ "return res;}");*/
//Commented by Poonam B[16-12-2019][To avoid nullPointer][END]
//Ended by Varsha V on 02-12-19
AdmCommon admCommon = new AdmCommon();
//Commented by Poonam B[16-12-2019][To avoid nullPointer][START]
//AdmCommon admCommon = new AdmCommon();
//Commented by Poonam B[16-12-2019][To avoid nullPointer][END]
PayrollSplitgenAccPrc payrollPrc = new PayrollSplitgenAccPrc();
UtilMethods utilMethods = new UtilMethods();
......@@ -928,6 +932,16 @@ public class AllowDednSalComp
{
//Added below line by Varsha V on 02-12-19
admCommonConn = argConn;
//added by Poonam B[16-12-2019][To avoid nullPointer][START]
exprsEngine.eval("function GF_GETENV(a,b) {var compName = Packages.ibase.webitm.ejb.adm.AllowDednSalComp;"
+ "var obj = new Packages.ibase.webitm.ejb.adm.AllowDednSalComp();"
+ "var res = obj.getEnv(a,b);"
+ "return res;}");
exprsEngine.eval("function GF_CALL_PYRL_DDF(a,b,c,d,e,f) {var compName = Packages.ibase.webitm.ejb.adm.AllowDednSalComp;"
+ "var obj = new Packages.ibase.webitm.ejb.adm.AllowDednSalComp();"
+ "var res = obj.gfCallPayrollDdf(a,b,c,d,e,f);"
+ "return res;}");
//added by Poonam B[16-12-2019][To avoid nullPointer][END]
/*sql = "select date_join, relieve_date, retirement_date from employee where emp_code = ? ";
pstmt = argConn.prepareStatement(sql);*/
......@@ -2207,7 +2221,7 @@ public class AllowDednSalComp
{
errorCode = utilMethods.mid(lsProcessAttd, 5);
}
if(errorCode == null || errorCode.trim().length()==0)
if(errorCode == null || errorCode.trim().length() == 0)
{
sql = "select sum(case when work_days is null then 0 else work_days end) as work_days, " +
" sum(case when paid_days is null then 0 else paid_days end) as paid_days, " +
......
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