Skip to content

B
business-java
Commit a884d22e authored by rtelang's avatar rtelang
Browse files
Options

*Added updated SQL, SRD, metadata and components of Change Bond Details menu [07-01-2020] 

EmpBondDefault.java
EmpBondDefConfirm.java
FullFinalAct.java
EmpBondDefinition.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214731 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 428e7c89
Show whitespace changes
Inline Side-by-side
Showing with 1296 additions and 585 deletions
webitm-adm/src/ibase/webitm/ejb/adm/adv/FullFinalAct.java
View file @ a884d22e
package ibase.webitm.ejb.adm.adv; package ibase.webitm.ejb.adm.adv;
//Added by RAHUL SHENOY on 24/08/2015 [Required imports for getBifurDomValue and nodeToString methods].Start
import java.io.StringWriter;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Timestamp;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
//import java.util.*; //import java.util.*;
//import java.util.Date; //import java.util.Date;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.sql.*;
import org.w3c.dom.*;
import java.text.*;
import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.utility.GenericUtility;
import ibase.system.config.*;
import java.text.SimpleDateFormat;
import javax.ejb.Stateless; // added for ejb3 import javax.ejb.Stateless; // added for ejb3
//Added by RAHUL SHENOY on 24/08/2015 [Required imports for getBifurDomValue and nodeToString methods].Start
import java.io.StringWriter;
import java.util.ArrayList;
import javax.xml.transform.OutputKeys; import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer; import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
...@@ -34,12 +29,30 @@ import javax.xml.transform.dom.DOMSource; ...@@ -34,12 +29,30 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
//Added by RAHUL SHENOY on 24/08/2015 [Required imports for getBifurDomValue and nodeToString methods].End //Added by RAHUL SHENOY on 24/08/2015 [Required imports for getBifurDomValue and nodeToString methods].End
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.adm.AdmCommon;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
@Stateless @Stateless
public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,FullFinalActRemote //SessionBean public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,FullFinalActRemote //SessionBean
{ {
//UPDATED BY NISAR ON 13/12/07 //UPDATED BY NISAR ON 13/12/07
LogWriter log = new LogWriter();//added by nisar on 27/11/07 LogWriter log = new LogWriter();//added by nisar on 27/11/07
double bondAmount=0.0; double bondAmount=0.0;
//Added by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
AdmCommon admCommon = new AdmCommon();
Connection conn = null;
//Added by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
/*public void ejbCreate() throws RemoteException, CreateException /*public void ejbCreate() throws RemoteException, CreateException
{ {
log.setNameOfLog("FullFinalactEJB"); log.setNameOfLog("FullFinalactEJB");
...@@ -81,11 +94,16 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -81,11 +94,16 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("..................FullFinalActEJB called.............."); log.write("..................FullFinalActEJB called..............");
Document dom = null; Document dom = null;
Document dom1 = null; Document dom1 = null;
//Connection conn = null; // Yashwant - 03/01/2020 [Defined at class level]
String resString = null; String resString = null;
try try
{ {
GenericUtility genericUtility = GenericUtility.getInstance(); System.out.println("xtraParams@@@@@@1111...."+xtraParams);
////Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
if(xmlString != null && xmlString.trim().length()!=0) if(xmlString != null && xmlString.trim().length()!=0)
{ {
System.out.println( "XML String :" + xmlString ); System.out.println( "XML String :" + xmlString );
...@@ -109,6 +127,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -109,6 +127,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.writeException(e); log.writeException(e);
throw new ITMException(e); throw new ITMException(e);
} }
//Added by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
finally
{
if(admCommon != null)
{
admCommon = null;
}
}
//Added by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("returning from actionMETHOD :actionHandler"+resString); System.out.println("returning from actionMETHOD :actionHandler"+resString);
//log.write("returning from actionMETHOD :actionHandler"+resString); //log.write("returning from actionMETHOD :actionHandler"+resString);
return resString; return resString;
...@@ -118,8 +145,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -118,8 +145,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
{ {
String empCode = "", tranID = "", relieveDt = "", sqlStr =""; String empCode = "", tranID = "", relieveDt = "", sqlStr ="";
String resLnint ="", resAllwdedn ="", resMiscpay ="", resNp="", resGratuity ="",resultBond=""; String resLnint ="", resAllwdedn ="", resMiscpay ="", resNp="", resGratuity ="",resultBond="";
String returnString = "", childNodeName = ""; String returnString = "", childNodeName = "", chgTerm="",chgUser="";
Connection conn = null; //Connection conn = null; // Yashwant - 03/01/2020 [Defined at class level]
ResultSet rs = null; ResultSet rs = null;
Statement stmst = null; Statement stmst = null;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
...@@ -130,7 +157,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -130,7 +157,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
System.out.println("\t ====================================================="); System.out.println("\t =====================================================");
System.out.println("\t actionDefault Starts ........."); System.out.println("\t actionDefault Starts .........");
System.out.println("\t ====================================================="); System.out.println("\t =====================================================");
System.out.println("xtraParams@@@@@@...."+xtraParams);
log.write("===================actionDefault() method called============================="); log.write("===================actionDefault() method called=============================");
//NodeList nlist = dom1.getElementsByTagName("Detail2"); //NodeList nlist = dom1.getElementsByTagName("Detail2");
...@@ -139,9 +166,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -139,9 +166,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
valueXmlString = new StringBuffer(); valueXmlString = new StringBuffer();
String errCode = "";//Added by sarita on 20 JULY 18 String errCode = "";//Added by sarita on 20 JULY 18
try try
{ {
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
conn = getConnection();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("Value of chgTerm>>>"+chgTerm);
System.out.println("Value of chgUser>>>"+chgUser);
valueXmlString.append("<?xml version=\"1.0\"?>\r\n"); valueXmlString.append("<?xml version=\"1.0\"?>\r\n");
valueXmlString.append("<Root>\r\n"); valueXmlString.append("<Root>\r\n");
//StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n"); //StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
...@@ -264,13 +303,32 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -264,13 +303,32 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally
{
try
{
if(conn != null)
{
conn.close();
conn = null;
}
}
catch (Exception e1)
{
System.out.println("Exception in connection closing: TrainingDefault : actionHandler " + e1.getMessage());
e1.printStackTrace();
}
}
} }
//Dadaso V. pawar on 02/jan/2013 //Dadaso V. pawar on 02/jan/2013
private String calculateBondAmount(Document dom1) throws ITMException private String calculateBondAmount(Document dom1) throws ITMException
{ {
System.out.println(":::Inside calculateBondAmount:::");
StringBuffer valueXml = new StringBuffer(); StringBuffer valueXml = new StringBuffer();
Connection conn = null; // Connection conn = null; // Yashwant 03/01/2020 [Use class level connection]
Statement stmt = null, stmt1 = null; Statement stmt = null, stmt1 = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -293,9 +351,25 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -293,9 +351,25 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
java.util.Date nullDate = null; java.util.Date nullDate = null;
java.util.Date todayDate = new java.util.Date(); //Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//java.util.Date todayDate = new java.util.Date();
Timestamp todayDate = new Timestamp(System.currentTimeMillis());
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
//Modified by RAHUL SHENOY on 23/07/2015 [Decalaration of variables].End //Modified by RAHUL SHENOY on 23/07/2015 [Decalaration of variables].End
//Added by Yashwant S.on 24-12-19[Start][Decalaration of variables][CCF No: IT2018-015 / Request ID: A18CSUN011]
String adCode = "";
String tranIdPvouch = "";
int lineNoPvouch = 0, lineNoBond = 0;
String tranIdBond = "";
String sql1 = "";
String pVouchRefNo = "";
PreparedStatement pstmt1 = null;
PreparedStatement pstmtGetBondInfo = null;
ResultSet rs1 = null;
double bondRecoveredAmt = 0d;
//Added by Yashwant S.on 24-12-19[End][Decalaration of variables][CCF No: IT2018-015 / Request ID: A18CSUN011]
try try
{ {
...@@ -303,11 +377,14 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -303,11 +377,14 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);*/ conn.setAutoCommit(false);*/
conn = getConnection(); // conn = getConnection(); // Yashwant 03/01/2020 [Use class level connection]
//----Commented and changed connection buy Jaffar on 09-04-19[End] //----Commented and changed connection buy Jaffar on 09-04-19[End]
stmt = conn.createStatement(); stmt = conn.createStatement();
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
empCode = genericUtility.getColumnValue( "emp_code", dom1,"1"); empCode = genericUtility.getColumnValue( "emp_code", dom1,"1");
...@@ -341,13 +418,18 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -341,13 +418,18 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//bondAdCode = getEnvAdm(paySite,cadreCode,gradeCode,"BOND_AD_CODE",todayDate,conn);
bondAdCode = admCommon.getAdmEnv(paySite,cadreCode,gradeCode,"BOND_AD_CODE",todayDate,conn);
//Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
bondAdCode = getEnvAdm(paySite,cadreCode,gradeCode,"BOND_AD_CODE",todayDate,conn);
System.out.println("bond adcode is... "+bondAdCode); System.out.println("bond adcode is... "+bondAdCode);
if(bondAdCode == null || bondAdCode.trim().equals("NULLFOUND")) if(bondAdCode == null || bondAdCode.trim().equals("NULLFOUND"))
{ {
bondAdCode = getEnv("999999","BOND_AD_CODE",conn); //Modified by Yashwant S.on 03-01-2020[Start]
//bondAdCode = getEnv("999999","BOND_AD_CODE",conn);
bondAdCode = admCommon.getEnv("999999","BOND_AD_CODE",conn);
//Modified by Yashwant S.on 03-01-2020[Start]
} }
//Modified by Sana on [29/03/2016][A15DSUN003][To return blank if bondAdCode is null or its length is zero][Start] //Modified by Sana on [29/03/2016][A15DSUN003][To return blank if bondAdCode is null or its length is zero][Start]
if(bondAdCode == null || bondAdCode.trim().length() == 0 || bondAdCode.trim().equals("NULLFOUND")) if(bondAdCode == null || bondAdCode.trim().length() == 0 || bondAdCode.trim().equals("NULLFOUND"))
...@@ -388,25 +470,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -388,25 +470,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
pstmt = null; pstmt = null;
} }
if(cctrCodeSal != null) if(cctrCodeSal != null)
{ {
cctrCode = cctrCodeSal; cctrCode = cctrCodeSal;
} }
sql ="select fin_entity from site where site_code= ? "; sql ="select fin_entity from site where site_code= ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, paySite); pstmt.setString(1, paySite);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
finEntity = rs.getString(1); finEntity = rs.getString(1);
} }
sql =""; sql ="";
if(rs != null) if(rs != null)
{ {
...@@ -424,12 +501,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -424,12 +501,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, finEntity); pstmt.setString(1, finEntity);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
currCodeTo = rs.getString(1); currCodeTo = rs.getString(1);
} }
sql = ""; sql = "";
if(rs != null) if(rs != null)
{ {
...@@ -446,11 +521,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -446,11 +521,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//Modified by RAHUL SHENOY on 23/07/2015 [Calculation of intermediate variables for calculating bondAmount].End //Modified by RAHUL SHENOY on 23/07/2015 [Calculation of intermediate variables for calculating bondAmount].End
relieveDate = genericUtility.getValidDateTimeString(relieveDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); relieveDate = genericUtility.getValidDateTimeString(relieveDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
sql="select date_join,relieve_date,bond_amt__reco from employee where emp_code = ? "; sql="select date_join,relieve_date,bond_amt__reco from employee where emp_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
...@@ -462,7 +535,6 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -462,7 +535,6 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
timestampDateR = rs.getTimestamp(2); timestampDateR = rs.getTimestamp(2);
bondAmtReco=rs.getDouble(3) <= 0.0 ? 0.0 : rs.getDouble(3); bondAmtReco=rs.getDouble(3) <= 0.0 ? 0.0 : rs.getDouble(3);
dateJoin= timestampDateJ==null? "":simpleDateFormat.format(timestampDateJ).toString(); dateJoin= timestampDateJ==null? "":simpleDateFormat.format(timestampDateJ).toString();
dateRelieve= timestampDateR==null? "":simpleDateFormat.format(timestampDateR).toString(); dateRelieve= timestampDateR==null? "":simpleDateFormat.format(timestampDateR).toString();
...@@ -511,7 +583,6 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -511,7 +583,6 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
else else
splityearR="20"+datearrayR[2]; splityearR="20"+datearrayR[2];
System.out.println("splitdate :--> "+splitdateR+" splitmonth :--> "+splitmonthR+" splityear :--> "+splityearR); System.out.println("splitdate :--> "+splitdateR+" splitmonth :--> "+splitmonthR+" splityear :--> "+splityearR);
Calendar dateJ = new GregorianCalendar(Integer.parseInt(splityearR), Integer.parseInt(splitmonthR), Integer.parseInt(splitdateR)); Calendar dateJ = new GregorianCalendar(Integer.parseInt(splityearR), Integer.parseInt(splitmonthR), Integer.parseInt(splitdateR));
...@@ -523,6 +594,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -523,6 +594,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
// Modified by Piyush on 30/07/2015 [To consider only bond amount > 0] // Modified by Piyush on 30/07/2015 [To consider only bond amount > 0]
//sql="select BOND_AMT,BOND_PRD from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ? order by BOND_PRD"; //sql="select BOND_AMT,BOND_PRD from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ? order by BOND_PRD";
//Added by Yashwant S.on 26-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
/*
sql="select BOND_AMT,BOND_PRD from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ? and case when bond_amt is null then 0 else bond_amt end > 0 order by BOND_PRD"; sql="select BOND_AMT,BOND_PRD from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ? and case when bond_amt is null then 0 else bond_amt end > 0 order by BOND_PRD";
pstmt= conn.prepareStatement(sql); pstmt= conn.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
...@@ -563,12 +637,190 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -563,12 +637,190 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
detInsert = wf_det_insert(tranID, bondAdCode, descr, amount1, nullDate , "" , "" , acctCode , cctrCode , remarks , "" , "" , currCode , 1 , amount1 , 1); detInsert = wf_det_insert(tranID, bondAdCode, descr, amount1, nullDate , "" , "" , acctCode , cctrCode , remarks , "" , "" , currCode , 1 , amount1 , 1);
} }
//Modified by Rahul Shenoy on 23/07/2015 [Setting the remarks, amount1 and returning detInsert].End //Modified by Rahul Shenoy on 23/07/2015 [Setting the remarks, amount1 and returning detInsert].End
*/
HashMap<String , List> bondMap = new HashMap<String , List>();
// sql="select BOND_AMT, BOND_PRD, TRAN_ID, LINE_NO, AD_CODE, TRAN_ID__PVOUCH, LINE_NO__PVOUCH from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ? and case when bond_amt is null then 0 else bond_amt end > 0 order by AD_CODE, BOND_PRD ";
//sql="select BOND_AMT, BOND_PRD, TRAN_ID, LINE_NO, AD_CODE, TRAN_ID__PVOUCH, LINE_NO__PVOUCH from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ? and case when bond_amt is null then 0 else bond_amt end > 0 order by tran_id, BOND_PRD ";
sql="select BOND_AMT, BOND_PRD, TRAN_ID, LINE_NO, AD_CODE, TRAN_ID__PVOUCH, LINE_NO__PVOUCH from EMPLOYEE_BOND WHERE EMP_CODE = ? and BOND_PRD >= ROUND(MONTHS_BETWEEN(CASE WHEN TRAN_ID__PVOUCH IS NULL THEN ? ELSE (SELECT TRAN_DATE FROM PAYR_VOUCHER WHERE TRAN_ID = EMPLOYEE_BOND.TRAN_ID__PVOUCH) END, ?),0) and case when bond_amt is null then 0 else bond_amt end > 0 order by tran_id, BOND_PRD ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1,empCode);
// pstmt.setInt(2,monthsBetween);
pstmt.setTimestamp(2,timestampDateJ);
pstmt.setTimestamp(3,timestampDateR);
rs = pstmt.executeQuery();
while (rs.next())
{
bondAmt = rs.getDouble("BOND_AMT");
bondAmt = bondAmt < 0d ? 0.0 : bondAmt;
bondPrd = rs.getInt("BOND_PRD") ;
bondPrd = bondPrd < 1 ? 0 : bondPrd;
tranIdBond = rs.getString("TRAN_ID");
tranIdBond = tranIdBond == null ? "" : tranIdBond;
adCode = rs.getString("AD_CODE");
adCode = adCode == null ? "" : adCode;
tranIdPvouch = rs.getString("TRAN_ID__PVOUCH");
tranIdPvouch = tranIdPvouch == null ? "" : tranIdPvouch;
lineNoPvouch = rs.getInt("LINE_NO__PVOUCH");
lineNoPvouch = lineNoPvouch < 1 ? 0 : lineNoPvouch;
lineNoBond = rs.getInt("LINE_NO");
lineNoBond = lineNoBond < 1 ? 0 : lineNoBond;
System.out.println("bondAmt -->"+bondAmt);
System.out.println("bondPrd -->"+bondPrd);
System.out.println("tranIdBond -->"+tranIdBond);
System.out.println("adCode -->"+adCode);
System.out.println("tranIdPvouch -->"+tranIdPvouch);
System.out.println("lineNoPvouch -->"+lineNoPvouch);
// String key = tranIdBond.trim() + ":" + lineNoBond;
String key = tranIdBond.trim();
System.out.println("key -->"+key);
if(bondMap != null && bondMap.containsKey(key))
{
continue;
}
else
{
ArrayList bondList = new ArrayList();
bondList.add(0, empCode);
bondList.add(1, adCode);
bondList.add(2, tranIdPvouch);
bondList.add(3, lineNoPvouch);
bondList.add(4, acctCode);
bondList.add(5, cctrCode);
bondList.add(6, currCode);
bondList.add(7, exchRate);
bondList.add(8, bondAmt);
bondMap.put(key,bondList);
}
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
System.out.println("Final Map is "+bondMap);
sql = "select pvd.ACCT_CODE as ACCT_CODE, pvd.CCTR_CODE as CCTR_CODE, pvh.CURR_CODE as CURR_CODE, pvd.AMOUNT as AMOUNT, pvh.EXCH_RATE as EXCH_RATE, pvh.REF_NO AS REF_NO from PAYR_VOUCHER pvh, payr_vouchdet pvd where pvh.Tran_Id = ? and pvd.tran_id = pvh.tran_id and pvd.line_no = ?";
pstmtGetBondInfo = conn.prepareStatement(sql);
sql1 = "select descr, ACCT_CODE__SAL from allwdedn where AD_CODE = ?";
pstmt1 = conn.prepareStatement(sql1);
for (String key : bondMap.keySet())
{
amount1 = 0d;
bondAmount = 0d;
pVouchRefNo = "";
bondRecoveredAmt = 0d;
ArrayList listValues = (ArrayList) bondMap.get(key);
System.out.println("key is ["+key+"] \t List Values are ["+listValues+"]");
adCode = (String) listValues.get(1);
tranIdPvouch = (String) listValues.get(2);
lineNoPvouch = (int) listValues.get(3);
acctCode = (String) listValues.get(4);
cctrCode = (String) listValues.get(5);
currCode = (String) listValues.get(6);
exchRate = (Double) listValues.get(7);
bondAmt = (Double) listValues.get(8);
pstmt1.setString(1,adCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
descr = rs1.getString("descr");
acctCode = rs1.getString("ACCT_CODE__SAL");
}
if(rs1 != null)
{
rs1.close();
rs1 = null;
}
pstmt1.clearParameters();
exchRate = 1d;
dailyExchrate = 1d;
currCode = currCodeTo;
if(tranIdPvouch != null && tranIdPvouch.trim().length() > 0)
{
pstmtGetBondInfo.setString(1, tranIdPvouch);
pstmtGetBondInfo.setInt(2, lineNoPvouch);
rs = pstmtGetBondInfo.executeQuery();
if(rs.next())
{
acctCode = rs.getString("ACCT_CODE");
cctrCode = rs.getString("CCTR_CODE");
currCode = rs.getString("CURR_CODE");
exchRate = rs.getDouble("EXCH_RATE");
pVouchRefNo = rs.getString("REF_NO");
}
if(rs != null)
{
rs.close();
rs = null;
}
pstmtGetBondInfo.clearParameters();
bondRecoveredAmt = 0d;
}
else
{
pVouchRefNo = "";
bondRecoveredAmt = bondAmtReco;
}
System.out.println("@@@------>>> BOND AMT : "+bondAmt+" Bond Period : "+bondPrd);
bondAmount = bondAmt - bondRecoveredAmt;
amount1 = bondAmount * (-1);
amount1 = getRequiredDecimal(amount1, 3);
System.out.println("bondAmount ---->>"+bondAmount);
System.out.println("amount1 ---->>"+amount1);
if ((pVouchRefNo != null && pVouchRefNo.toUpperCase().startsWith("RV-")) || (amount1 == 0d))
{
continue;
}
dailyExchrate = finCommon.getDailyExchRateSellBuy( currCode, currCodeTo, paySite, trDate, "B", conn );
remarks = "Towards " + adCode + " Recovery for " + bondPrd + " Months" ;
remarks = getRemarksByFunction(empCode, relieveDate.toString(), "BONDRECO", "", "", bondAdCode, null, null, amount1, bondPrd, acctCode, cctrCode, conn, remarks);
detInsert = wf_det_insert(tranID, adCode, descr, amount1, nullDate , "" , "" , acctCode , cctrCode , remarks , "" , "" , currCode , exchRate , amount1 , dailyExchrate);
valueXml = valueXml.append(detInsert);
}
if (pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if (pstmtGetBondInfo != null)
{
pstmtGetBondInfo.close();
pstmtGetBondInfo = null;
}
//Added by Yashwant S.on 26-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
} }
else else
{ {
System.out.println("-------->>> Date join or relieve date null"); System.out.println("-------->>> Date join or relieve date null");
bondAmount=0.0; bondAmount=0.0;
} }
} }
...@@ -603,11 +855,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -603,11 +855,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt.close(); stmt.close();
stmt = null; stmt = null;
} }
// Yashwant 03/01/2020 [Use class level connection].Start
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
// Yashwant 03/01/2020 [Use class level connection].End
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -618,6 +874,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -618,6 +874,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
} }
System.out.println("@@@ valueXmlString [ "+valueXml.toString()+" ]"); System.out.println("@@@ valueXmlString [ "+valueXml.toString()+" ]");
detInsert = valueXml.toString();
//Modified by RAHUL SHENOY on 30/07/2015 [Returning detInsert instead of valueXml.toString()].Start //Modified by RAHUL SHENOY on 30/07/2015 [Returning detInsert instead of valueXml.toString()].Start
//return valueXml.toString(); //return valueXml.toString();
return detInsert; return detInsert;
...@@ -647,13 +904,18 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -647,13 +904,18 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
String loanNo = "", schemeNo = "", adCodeDed = "", adCodeInt = "", finEntity = "", currCodeTo = ""; String loanNo = "", schemeNo = "", adCodeDed = "", adCodeInt = "", finEntity = "", currCodeTo = "";
double loanAmt = 0d, balanceAmt = 0d,intAmt = 0d, intDecucted = 0d, loanReco = 0d, retdAmt = 0d; double loanAmt = 0d, balanceAmt = 0d,intAmt = 0d, intDecucted = 0d, loanReco = 0d, retdAmt = 0d;
double dailyExchrate = 0d; double dailyExchrate = 0d;
Connection conn = null; //Connection conn = null; // Yashwant 03/01/2020 [Use class level connection]
Statement stmt = null, stmt1 = null; Statement stmt = null, stmt1 = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null, rsMain = null; ResultSet rs = null, rsMain = null;
java.sql.Timestamp effDate = null, expDate = null; java.sql.Timestamp effDate = null, expDate = null;
//changes done by chitranjan 29//05/12 //changes done by chitranjan 29//05/12
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
// Modified by Yashwant on 03/01/2020.Start
PreparedStatement pstmtLoanReco = null;
PreparedStatement pstmtPayrollDet = null;
PreparedStatement pstmtAdInfo = null;
// Modified by Yashwant on 03/01/2020.End
System.out.println("\t ====================================================="); System.out.println("\t =====================================================");
System.out.println("\t calcOfLoanInt Starts ........."); System.out.println("\t calcOfLoanInt Starts .........");
System.out.println("\t ====================================================="); System.out.println("\t =====================================================");
...@@ -665,11 +927,14 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -665,11 +927,14 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);*/ conn.setAutoCommit(false);*/
conn = getConnection(); // conn = getConnection(); // Yashwant 03/01/2020 [Use class level connection]
//----Commented and changed connection buy Jaffar on 09-04-19[End] //----Commented and changed connection buy Jaffar on 09-04-19[End]
stmt = conn.createStatement(); stmt = conn.createStatement();
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
empCode = genericUtility.getColumnValue("emp_code", dom1,"1"); empCode = genericUtility.getColumnValue("emp_code", dom1,"1");
tranID = genericUtility.getColumnValue("tran_id", dom1,"1"); tranID = genericUtility.getColumnValue("tran_id", dom1,"1");
...@@ -694,7 +959,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -694,7 +959,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
java.util.Date tranDate = new java.util.Date(); java.util.Date tranDate = new java.util.Date();
tranDate = new SimpleDateFormat(genericUtility.getApplDateFormat()).parse(trDate); tranDate = new SimpleDateFormat(genericUtility.getApplDateFormat()).parse(trDate);
if(relieveDt != null)
{
relieveDate = genericUtility.getValidDateTimeString(relieveDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); relieveDate = genericUtility.getValidDateTimeString(relieveDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
}
/* /*
sqlStr = "SELECT CODE, FR_DATE, TO_DATE FROM PERIOD WHERE '"+relieveDate+"' BETWEEN FR_DATE AND TO_DATE "; sqlStr = "SELECT CODE, FR_DATE, TO_DATE FROM PERIOD WHERE '"+relieveDate+"' BETWEEN FR_DATE AND TO_DATE ";
System.out.println("Sql String : "+sqlStr); System.out.println("Sql String : "+sqlStr);
...@@ -752,6 +1021,72 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -752,6 +1021,72 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
rs = null; rs = null;
// Modified by Yashwant on 03/01/2020.Start
stmt.close();
stmt = null;
sqlStr = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = '"+paySite+"'";
System.out.println("Sql String : "+sqlStr);
log.write("Sql String : "+sqlStr);
stmt1 = conn.createStatement();
rs = stmt1.executeQuery(sqlStr);
if (rs.next())
{
finEntity = rs.getString("FIN_ENTITY");
}
rs.close();
rs = null;
stmt1.close();
stmt1 = null;
sqlStr = "SELECT CURR_CODE FROM FINENT WHERE FIN_ENTITY = '"+finEntity+"'";
System.out.println("Sql String : "+sqlStr);
log.write("Sql String : "+sqlStr);
stmt1 = conn.createStatement();
rs = stmt1.executeQuery(sqlStr);
if (rs.next())
{
currCodeTo = rs.getString("CURR_CODE");
System.out.println("[FullFinalActEJB] wf_calc_lnint() :currCodeTo ===============>"+currCodeTo);
log.write("[FullFinalActEJB] wf_calc_lnint() :currCodeTo ===============>"+currCodeTo);
}
else
{
System.out.println("[FullFinalActEJB] wf_calc_lnint() :errorCode ===============>VTNOROWS:ERROR");
log.write("[FullFinalActEJB] wf_calc_lnint() :errorCode ===============>VTNOROWS:ERROR");
return "VTNOROWS:ERROR";
}
rs.close();
rs = null;
stmt1.close();
stmt1 = null;
sqlStr = "SELECT CASE WHEN SUM(CASE WHEN RECO_AMT IS NULL THEN 0 ELSE RECO_AMT END) IS NULL THEN 0 " +
" ELSE SUM(CASE WHEN RECO_AMT IS NULL THEN 0 ELSE RECO_AMT END) END " +
" FROM LOAN_RECO " +
" WHERE LOAN_NO = ?";
pstmtLoanReco = conn.prepareStatement(sqlStr);
sqlStr = "SELECT CASE WHEN SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) IS NULL THEN 0 " +
" ELSE SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) END " +
" FROM PAYROLLDET,PERIOD" +
" WHERE PAYROLLDET.EMP_CODE = ?" +
" AND PAYROLLDET.PRD_CODE = PERIOD.CODE" +
" AND PERIOD.CODE > '0'" +
" AND PAYROLLDET.AD_CODE IN( ? , ?)" +
" AND PAYROLLDET.REF_NO = ?";
pstmtPayrollDet = conn.prepareStatement(sqlStr);
sqlStr = "SELECT ACCT_CODE__SAL, CCTR_CODE__SAL, DESCR " +
" FROM ALLWDEDN" +
" WHERE AD_CODE = ?";
pstmtAdInfo = conn.prepareStatement(sqlStr);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_lnint() :cctrSalEmp ===============>"+cctrSalEmp); System.out.println("[FullFinalActEJB] wf_calc_lnint() :cctrSalEmp ===============>"+cctrSalEmp);
System.out.println("[FullFinalActEJB] wf_calc_lnint() :paySite ===============>"+paySite); System.out.println("[FullFinalActEJB] wf_calc_lnint() :paySite ===============>"+paySite);
...@@ -794,7 +1129,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -794,7 +1129,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
System.out.println("Sql String : "+sqlStr); System.out.println("Sql String : "+sqlStr);
log.write("Sql String : "+sqlStr); log.write("Sql String : "+sqlStr);
stmt = conn.createStatement();
rsMain = stmt.executeQuery(sqlStr); rsMain = stmt.executeQuery(sqlStr);
if(rsMain.next()) if(rsMain.next())
{ {
...@@ -829,6 +1164,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -829,6 +1164,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
// --- Collect total direct rercoverry against each loans // --- Collect total direct rercoverry against each loans
sqlStr = ""; sqlStr = "";
System.out.println("line no : ---------->>> 570"); System.out.println("line no : ---------->>> 570");
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].Start
/*
sqlStr = "SELECT CASE WHEN SUM(CASE WHEN RECO_AMT IS NULL THEN 0 ELSE RECO_AMT END) IS NULL THEN 0 " + sqlStr = "SELECT CASE WHEN SUM(CASE WHEN RECO_AMT IS NULL THEN 0 ELSE RECO_AMT END) IS NULL THEN 0 " +
" ELSE SUM(CASE WHEN RECO_AMT IS NULL THEN 0 ELSE RECO_AMT END) END " + " ELSE SUM(CASE WHEN RECO_AMT IS NULL THEN 0 ELSE RECO_AMT END) END " +
" FROM LOAN_RECO " + " FROM LOAN_RECO " +
...@@ -851,6 +1188,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -851,6 +1188,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs = null; rs = null;
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
pstmtLoanReco.setString(1 , loanNo);
rs = pstmtLoanReco.executeQuery();
if (rs.next())
{
loanReco = rs.getDouble(1);
}
else
{
loanNo = "0";
}
rs.close();
rs = null;
pstmtLoanReco.clearParameters();
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].Start
System.out.println("[FullFinalActEJB] wf_calc_lnint() :loanReco ===============>"+loanReco); System.out.println("[FullFinalActEJB] wf_calc_lnint() :loanReco ===============>"+loanReco);
System.out.println("[FullFinalActEJB] wf_calc_lnint() :loanNo ===============>"+loanNo); System.out.println("[FullFinalActEJB] wf_calc_lnint() :loanNo ===============>"+loanNo);
...@@ -871,6 +1223,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -871,6 +1223,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
" AND AYROLLDET.AD_CODE IN( '"+adCodeDed+"' , '"+adCodeInt+"')" + " AND AYROLLDET.AD_CODE IN( '"+adCodeDed+"' , '"+adCodeInt+"')" +
" AND AYROLLDET.REF_NO = '"+loanNo+"'";*/ " AND AYROLLDET.REF_NO = '"+loanNo+"'";*/
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].Start
/*
sqlStr = "SELECT CASE WHEN SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) IS NULL THEN 0 " + sqlStr = "SELECT CASE WHEN SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) IS NULL THEN 0 " +
" ELSE SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) END " + " ELSE SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) END " +
" FROM PAYROLLDET,PERIOD" + " FROM PAYROLLDET,PERIOD" +
...@@ -898,6 +1252,26 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -898,6 +1252,26 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs = null; rs = null;
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
pstmtPayrollDet.setString(1 , empCode);
pstmtPayrollDet.setString(2 , adCodeDed);
pstmtPayrollDet.setString(3 , adCodeInt);
pstmtPayrollDet.setString(4 , loanNo);
rs = pstmtPayrollDet.executeQuery();
if (rs.next())
{
retdAmt = rs.getDouble(1);
}
else
{
retdAmt = 0d;
intDecucted = 0d;
}
rs.close();
rs = null;
pstmtPayrollDet.clearParameters();
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].End
System.out.println("[FullFinalActEJB] wf_calc_lnint() :retdAmt ===============>"+retdAmt); System.out.println("[FullFinalActEJB] wf_calc_lnint() :retdAmt ===============>"+retdAmt);
System.out.println("[FullFinalActEJB] wf_calc_lnint() :intDecucted ===============>"+intDecucted); System.out.println("[FullFinalActEJB] wf_calc_lnint() :intDecucted ===============>"+intDecucted);
...@@ -926,6 +1300,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -926,6 +1300,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
{ {
remarks = "Interest On Loan No. : "+ loanNo; remarks = "Interest On Loan No. : "+ loanNo;
intAmt = intAmt *(-1); intAmt = intAmt *(-1);
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].Start
/*
sqlStr = "SELECT ACCT_CODE__SAL, CCTR_CODE__SAL, DESCR " + sqlStr = "SELECT ACCT_CODE__SAL, CCTR_CODE__SAL, DESCR " +
" FROM ALLWDEDN" + " FROM ALLWDEDN" +
" WHERE AD_CODE = '"+adCodeInt+"'"; " WHERE AD_CODE = '"+adCodeInt+"'";
...@@ -945,6 +1321,19 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -945,6 +1321,19 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs = null; rs = null;
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
pstmtAdInfo.setString(1 , adCodeInt);
rs = pstmtAdInfo.executeQuery();
if(rs.next())
{
acctCodeSal = rs.getString("ACCT_CODE__SAL");
cctrSalAllwdedn = rs.getString("CCTR_CODE__SAL");
descr = rs.getString("DESCR");
}
rs.close();
rs = null;
pstmtAdInfo.clearParameters();
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].End
//Added by Radheshyam[15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function] //Added by Radheshyam[15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
remarks = getRemarksByFunction(empCode, relieveDate, "LOANINT", "", loanNo, adCodeInt, null, null, intAmt, 0, acctCodeSal,cctrSalAllwdedn, conn, remarks); remarks = getRemarksByFunction(empCode, relieveDate, "LOANINT", "", loanNo, adCodeInt, null, null, intAmt, 0, acctCodeSal,cctrSalAllwdedn, conn, remarks);
...@@ -961,6 +1350,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -961,6 +1350,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
{ {
cctrSalAllwdedn = cctrSalEmp; cctrSalAllwdedn = cctrSalEmp;
} }
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].Start
/*
sqlStr = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = '"+paySite+"'"; sqlStr = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = '"+paySite+"'";
System.out.println("Sql String : "+sqlStr); System.out.println("Sql String : "+sqlStr);
...@@ -1000,6 +1392,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1000,6 +1392,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs = null; rs = null;
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
// Modified by Yashwant on 03/01/2020 [Used prepared statement outside of loop].End
java.util.Date nullDate = null; java.util.Date nullDate = null;
//ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); //ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//changes done by chitranjan --29//05//12 //changes done by chitranjan --29//05//12
...@@ -1041,6 +1435,28 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1041,6 +1435,28 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
rs = null; rs = null;
} }
// Yashwant 03/01/2020 [ClosingResult Set].Start
if(rsMain != null)
{
rsMain.close();
rsMain = null;
}
if (pstmtLoanReco != null)
{
pstmtLoanReco.close();
pstmtLoanReco = null;
}
if (pstmtPayrollDet != null)
{
pstmtPayrollDet.close();
pstmtPayrollDet = null;
}
if (pstmtAdInfo != null)
{
pstmtAdInfo.close();
pstmtAdInfo = null;
}
// Yashwant 03/01/2020 [ClosingResult Set].End
if(stmt != null) if(stmt != null)
{ {
stmt.close(); stmt.close();
...@@ -1051,11 +1467,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1051,11 +1467,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
} }
// Yashwant 03/01/2020 [Use class level connection].Start
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
// Yashwant 03/01/2020 [Use class level connection].End
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1078,7 +1498,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1078,7 +1498,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
int days1 = 0, days2 = 0; int days1 = 0, days2 = 0;
java.sql.Timestamp startDate = null, endDate = null; java.sql.Timestamp startDate = null, endDate = null;
Connection conn = null; // Connection conn = null; // Yashwant 03/01/2020 [Use class level connection]
ResultSet rs = null, rsMain = null; ResultSet rs = null, rsMain = null;
PreparedStatement stmt = null, stmt1 = null; PreparedStatement stmt = null, stmt1 = null;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
...@@ -1098,12 +1518,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1098,12 +1518,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//----Commented and changed connection buy Jaffar on 09-04-19[Start] //----Commented and changed connection buy Jaffar on 09-04-19[Start]
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");*/ conn = connDriver.getConnectDB("DriverITM");*/
conn = getConnection(); //conn = getConnection(); // Yashwant 03/01/2020 [Use class level connection]
//----Commented and changed connection buy Jaffar on 09-04-19[End] //----Commented and changed connection buy Jaffar on 09-04-19[End]
//stmt = conn.createStatement(); //stmt = conn.createStatement();
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
empCode = genericUtility.getColumnValue("emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07 empCode = genericUtility.getColumnValue("emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07
tranID = genericUtility.getColumnValue("tran_id", dom1,"1"); tranID = genericUtility.getColumnValue("tran_id", dom1,"1");
...@@ -1368,11 +1791,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1368,11 +1791,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
} }
// Yashwant 03/01/2020 [Use class level connection].Start
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
// Yashwant 03/01/2020 [Use class level connection].End
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1395,9 +1822,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1395,9 +1822,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
double diffExchrate = 0.0, diffAmt = 0.0, balanceAmt = 0.0, dailyExchrate = 0.0, exchRate = 0.0, netAmt = 0.0; double diffExchrate = 0.0, diffAmt = 0.0, balanceAmt = 0.0, dailyExchrate = 0.0, exchRate = 0.0, netAmt = 0.0;
java.sql.Date nullDate = null, endDate = null; java.sql.Date nullDate = null, endDate = null;
Connection conn = null; // Connection conn = null; // Yashwant 03/01/2020 [Use class level connection]
ResultSet rs = null, rsMain = null; ResultSet rs = null, rsMain = null;
Statement stmt = null, stmt1 = null; Statement stmt = null, stmt1 = null;
// Modified by Yashwant on 03/01/2020.Start
PreparedStatement pstmtMain = null;
PreparedStatement pstmtRemarksPvouch = null;//ALLWDEDN
PreparedStatement pstmtRemarksMvouch = null;
PreparedStatement pstmtAllwdedn = null;
// Modified by Yashwant on 03/01/2020.End
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//changes done by chitranjan --29//05//12 //changes done by chitranjan --29//05//12
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
...@@ -1407,12 +1840,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1407,12 +1840,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("===================wf_calc_miscpay() method called=================================="); log.write("===================wf_calc_miscpay() method called==================================");
try try
{ {
//----Commented and changed connection buy Jaffar on 09-04-19[Start] //----Commented and changed connection buy Jaffar on 09-04-19[Start]
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");*/ conn = connDriver.getConnectDB("DriverITM");*/
conn = getConnection(); // conn = getConnection();// Yashwant 03/01/2020 [Use class level connection]
//----Commented and changed connection buy Jaffar on 09-04-19[End] //----Commented and changed connection buy Jaffar on 09-04-19[End]
stmt = conn.createStatement(); stmt = conn.createStatement();
...@@ -1425,8 +1859,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1425,8 +1859,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//Added by Radheshyam[15/01/2014][Request ID : AD3GSUN001][to get value of relieve Date from Dom] //Added by Radheshyam[15/01/2014][Request ID : AD3GSUN001][to get value of relieve Date from Dom]
relieveDt = genericUtility.getColumnValue("relieve_date", dom1,"1"); relieveDt = genericUtility.getColumnValue("relieve_date", dom1,"1");
java.util.Date tranDate = new java.util.Date();
tranDate = new SimpleDateFormat(genericUtility.getApplDateFormat()).parse(trDate); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//java.util.Date tranDate = new java.util.Date();
//tranDate = new SimpleDateFormat(genericUtility.getApplDateFormat()).parse(trDate);
Timestamp tranDate = Timestamp.valueOf(genericUtility.getValidDateString(trDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
sqlStr = "SELECT CCTR_CODE__SAL, PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = '"+empCode+"'"; sqlStr = "SELECT CCTR_CODE__SAL, PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = '"+empCode+"'";
System.out.println("sqlStr1....:: " + sqlStr); System.out.println("sqlStr1....:: " + sqlStr);
log.write("sqlStr1....:: " + sqlStr); log.write("sqlStr1....:: " + sqlStr);
...@@ -1451,6 +1890,48 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1451,6 +1890,48 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] wf_calc_miscpay() :gradeCode ===============>"+gradeCode); log.write("[FullFinalActEJB] wf_calc_miscpay() :gradeCode ===============>"+gradeCode);
sqlStr = ""; sqlStr = "";
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].Start
sqlStr = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = '"+paySite+"'";
System.out.println("sqlStr4....:: " + sqlStr);
log.write("sqlStr4....:: " + sqlStr);
stmt1 = conn.createStatement();
rs = stmt1.executeQuery(sqlStr);
if(rs.next())
{
finEntity = rs.getString("FIN_ENTITY");
}
rs.close();
stmt1.close();
stmt1 = null;
sqlStr = "SELECT CURR_CODE FROM FINENT WHERE FIN_ENTITY = '"+finEntity+"'";
System.out.println("sqlStr5....:: " + sqlStr);
log.write("sqlStr5....:: " + sqlStr);
stmt1 = conn.createStatement();
rs = stmt1.executeQuery(sqlStr);
if(rs.next())
{
currCodeTo = rs.getString("CURR_CODE");
}
rs.close();
stmt1.close();
stmt1 = null;
sqlStr = "SELECT REMARKS FROM MISC_VOUCHER WHERE TRAN_ID = ?";
pstmtRemarksMvouch = conn.prepareStatement(sqlStr);
sqlStr = "SELECT REMARKS FROM PAYR_VOUCHER WHERE TRAN_ID = ?";
pstmtRemarksPvouch = conn.prepareStatement(sqlStr);
sqlStr = "SELECT ACCT_CODE__SAL, CCTR_CODE__SAL, DESCR FROM ALLWDEDN WHERE AD_CODE = ?";
pstmtAllwdedn = conn.prepareStatement(sqlStr);
/*
sqlStr = "SELECT TRAN_SER, REF_NO FROM MISC_PAYABLES " + sqlStr = "SELECT TRAN_SER, REF_NO FROM MISC_PAYABLES " +
" WHERE SUNDRY_TYPE = 'E' AND SUNDRY_CODE = '"+empCode+"' AND TOT_AMT - ADJ_AMT <> 0 "; " WHERE SUNDRY_TYPE = 'E' AND SUNDRY_CODE = '"+empCode+"' AND TOT_AMT - ADJ_AMT <> 0 ";
...@@ -1488,6 +1969,26 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1488,6 +1969,26 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
sqlStr = "SELECT TOT_AMT - ADJ_AMT AS BAL_AMT, ACCT_CODE, CCTR_CODE, CURR_CODE, EXCH_RATE, TRAN_SER, REF_NO FROM MISC_PAYABLES " +
" WHERE SUNDRY_TYPE = 'E' AND SUNDRY_CODE = ? AND TOT_AMT - ADJ_AMT <> 0 ";
System.out.println("sqlStr2....:: " + sqlStr);
log.write("sqlStr2....:: " + sqlStr);
pstmtMain = conn.prepareStatement(sqlStr);
pstmtMain.setString(1 , empCode);
rsMain = pstmtMain.executeQuery();
while(rsMain.next())
{
refSer = rsMain.getString("TRAN_SER");
refNo = rsMain.getString("REF_NO");
balanceAmt = rsMain.getDouble("BAL_AMT");
acctCode = rsMain.getString("ACCT_CODE");
cctrCode = rsMain.getString("CCTR_CODE");
currCode = rsMain.getString("CURR_CODE");
exchRate = rsMain.getDouble("EXCH_RATE");
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].End
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :balanceAmt ===============>"+balanceAmt); System.out.println("[FullFinalActEJB] wf_calc_miscpay() :balanceAmt ===============>"+balanceAmt);
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :acctCode ===============>"+acctCode); System.out.println("[FullFinalActEJB] wf_calc_miscpay() :acctCode ===============>"+acctCode);
...@@ -1506,6 +2007,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1506,6 +2007,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
cctrCode = cctrSalEmp; cctrCode = cctrSalEmp;
} }
netAmt = balanceAmt * exchRate; netAmt = balanceAmt * exchRate;
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].Start
/*
sqlStr = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = '"+paySite+"'"; sqlStr = "SELECT FIN_ENTITY FROM SITE WHERE SITE_CODE = '"+paySite+"'";
System.out.println("sqlStr4....:: " + sqlStr); System.out.println("sqlStr4....:: " + sqlStr);
...@@ -1535,6 +2039,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1535,6 +2039,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].End
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :currCodeTo ===============>"+currCodeTo); System.out.println("[FullFinalActEJB] wf_calc_miscpay() :currCodeTo ===============>"+currCodeTo);
log.write("[FullFinalActEJB] wf_calc_miscpay() :currCodeTo ===============>"+currCodeTo); log.write("[FullFinalActEJB] wf_calc_miscpay() :currCodeTo ===============>"+currCodeTo);
...@@ -1548,6 +2054,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1548,6 +2054,8 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
if(refSer.trim().equals("M-VOUC") || refSer.trim().equals("M-ADV")) if(refSer.trim().equals("M-VOUC") || refSer.trim().equals("M-ADV"))
{ {
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].Start
/*
sqlStr = "SELECT REMARKS FROM MISC_VOUCHER WHERE TRAN_ID = '"+refNo+"'"; sqlStr = "SELECT REMARKS FROM MISC_VOUCHER WHERE TRAN_ID = '"+refNo+"'";
System.out.println("sqlStr6....:: " + sqlStr); System.out.println("sqlStr6....:: " + sqlStr);
log.write("sqlStr6....:: " + sqlStr); log.write("sqlStr6....:: " + sqlStr);
...@@ -1560,9 +2068,22 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1560,9 +2068,22 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
pstmtRemarksMvouch.setString(1 , refNo);
rs = pstmtRemarksMvouch.executeQuery();
if(rs.next())
{
remarks = rs.getString("REMARKS");
}
rs.close();
pstmtRemarksMvouch.clearParameters();
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].End
} }
else if(refSer.trim().equals("P-VOUC")) else if(refSer.trim().equals("P-VOUC"))
{ {
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].Start
/*
sqlStr = "SELECT REMARKS FROM PAYR_VOUCHER WHERE TRAN_ID = '"+refNo+"'"; sqlStr = "SELECT REMARKS FROM PAYR_VOUCHER WHERE TRAN_ID = '"+refNo+"'";
System.out.println("sqlStr6....:: " + sqlStr); System.out.println("sqlStr6....:: " + sqlStr);
...@@ -1577,6 +2098,16 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1577,6 +2098,16 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
*/
pstmtRemarksPvouch.setString(1 , refNo);
rs = pstmtRemarksPvouch.executeQuery();
if(rs.next())
{
remarks = rs.getString("REMARKS");
}
rs.close();
pstmtRemarksPvouch.clearParameters();
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].End
} }
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function] //Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
//remarks = getRemarksByFunction(empCode, relieveDt, "MPAY", refSer, refNo, "", null, null, balanceAmt, 0, acctCode, cctrCode, conn, remarks);//Modified by Radheshyam [04/03/2014] //remarks = getRemarksByFunction(empCode, relieveDt, "MPAY", refSer, refNo, "", null, null, balanceAmt, 0, acctCode, cctrCode, conn, remarks);//Modified by Radheshyam [04/03/2014]
...@@ -1594,12 +2125,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1594,12 +2125,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
detInsert = detInsert + wf_det_insert(tranID,"","",balanceAmt,nullDate,"","",acctCode,cctrCode,remarks,refSer,refNo,currCode,exchRate,netAmt,dailyExchrate);//updated on 08/12/07 detInsert = detInsert + wf_det_insert(tranID,"","",balanceAmt,nullDate,"","",acctCode,cctrCode,remarks,refSer,refNo,currCode,exchRate,netAmt,dailyExchrate);//updated on 08/12/07
}//end of while(rsMain.next()) }//end of while(rsMain.next())
rsMain.close(); rsMain.close();
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].Start
/*
stmt.close(); stmt.close();
stmt = null; stmt = null;
*/
pstmtMain.close();
pstmtMain = null;
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].End
acctCode = ""; cctrCode = ""; acctCode = ""; cctrCode = "";
if(diffAmt != 0) if(diffAmt != 0)
{ {
currFluc = getEnvAdm(paySite,cadreCode,gradeCode,"CURR_FLUCTUATION",tranDate,conn); //Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//currFluc = getEnvAdm(paySite,cadreCode,gradeCode,"CURR_FLUCTUATION",tranDate,conn);
currFluc = admCommon.getAdmEnv(paySite,cadreCode,gradeCode,"CURR_FLUCTUATION",tranDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :currFluc ===============>"+currFluc); System.out.println("[FullFinalActEJB] wf_calc_miscpay() :currFluc ===============>"+currFluc);
log.write("[FullFinalActEJB] wf_calc_miscpay() :currFluc ===============>"+currFluc); log.write("[FullFinalActEJB] wf_calc_miscpay() :currFluc ===============>"+currFluc);
...@@ -1614,6 +2154,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1614,6 +2154,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
return errString; return errString;
} }
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].Start
/*
sqlStr = "SELECT ACCT_CODE__SAL, CCTR_CODE__SAL, DESCR FROM ALLWDEDN WHERE AD_CODE = '"+currFluc+"'"; sqlStr = "SELECT ACCT_CODE__SAL, CCTR_CODE__SAL, DESCR FROM ALLWDEDN WHERE AD_CODE = '"+currFluc+"'";
System.out.println("sqlStr7....:: " + sqlStr); System.out.println("sqlStr7....:: " + sqlStr);
log.write("sqlStr7....:: " + sqlStr); log.write("sqlStr7....:: " + sqlStr);
...@@ -1628,6 +2171,19 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1628,6 +2171,19 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
rs.close(); rs.close();
stmt.close(); stmt.close();
stmt = null; stmt = null;
*/
pstmtAllwdedn.setString(1, currFluc);
rs = pstmtAllwdedn.executeQuery();
if(rs.next())
{
acctCode = rs.getString("ACCT_CODE__SAL");
cctrCode = rs.getString("CCTR_CODE__SAL");
descr = rs.getString("DESCR");
}
rs.close();
pstmtAllwdedn.clearParameters();
// Modified by Yashwant on 03/01/2020 [To convert in prepared statement and added column from loop].End
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :acctCode ===============>"+acctCode); System.out.println("[FullFinalActEJB] wf_calc_miscpay() :acctCode ===============>"+acctCode);
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :cctrCode ===============>"+cctrCode); System.out.println("[FullFinalActEJB] wf_calc_miscpay() :cctrCode ===============>"+cctrCode);
...@@ -1692,11 +2248,30 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1692,11 +2248,30 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
} }
// Modified by Yashwant on 03/01/2020 [To close prepared statement].Start
if(pstmtRemarksMvouch != null)
{
pstmtRemarksMvouch.close();
pstmtRemarksMvouch = null;
}
if(pstmtRemarksPvouch != null)
{
pstmtRemarksPvouch.close();
pstmtRemarksPvouch = null;
}
if(pstmtAllwdedn != null)
{
pstmtAllwdedn.close();
pstmtAllwdedn = null;
}
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
// Modified by Yashwant on 03/01/2020 [To close prepared statement].End
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1709,7 +2284,6 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1709,7 +2284,6 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
private String wf_calc_np(Document dom1) throws ITMException private String wf_calc_np(Document dom1) throws ITMException
{ {
String empCode = "", tranID = "", relieveDt = "", currCode = "", detInsert = "", remarks = "", refSer = ""; String empCode = "", tranID = "", relieveDt = "", currCode = "", detInsert = "", remarks = "", refSer = "";
String adCode = "", cctrCodeSal = "", paySite = "", refType = "", refNo ="", cctrCode = ""; String adCode = "", cctrCodeSal = "", paySite = "", refType = "", refNo ="", cctrCode = "";
String finEntity = "", currCodeTo = "", trDate = "", acctCode = "", currFluc = "", descr = ""; String finEntity = "", currCodeTo = "", trDate = "", acctCode = "", currFluc = "", descr = "";
...@@ -1725,13 +2299,14 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1725,13 +2299,14 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
java.sql.Date nullDate = null, endDate = null, resignDate= null, relieveDateDb = null; java.sql.Date nullDate = null, endDate = null, resignDate= null, relieveDateDb = null;
java.sql.Timestamp resignDateT = null, relieveDateDbT = null; java.sql.Timestamp resignDateT = null, relieveDateDbT = null;
Connection conn = null; //Connection conn = null;
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
PreparedStatement stmt = null, stmt1 = null; PreparedStatement stmt = null, stmt1 = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//changes done by chitranjan --29//05//12 //changes done by chitranjan --29//05//12
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
AdmCommon admCommon = new AdmCommon();
System.out.println("\t ====================================================="); System.out.println("\t =====================================================");
System.out.println("\t calcOfNoticePay Starts ........."); System.out.println("\t calcOfNoticePay Starts .........");
System.out.println("\t ====================================================="); System.out.println("\t =====================================================");
...@@ -1743,12 +2318,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1743,12 +2318,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//----Commented and changed connection buy Jaffar on 09-04-19[Start] //----Commented and changed connection buy Jaffar on 09-04-19[Start]
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");*/ conn = connDriver.getConnectDB("DriverITM");*/
conn = getConnection(); //conn = getConnection();
//----Commented and changed connection buy Jaffar on 09-04-19[Start] //----Commented and changed connection buy Jaffar on 09-04-19[Start]
//stmt = conn.createStatement(); //stmt = conn.createStatement();
GenericUtility genericUtility = GenericUtility.getInstance(); // Modified by Yashwant on 03/01/2020.Start
E12GenericUtility genericUtility = new E12GenericUtility();
//GenericUtility genericUtility = GenericUtility.getInstance();
// Modified by Yashwant on 03/01/2020.End
empCode = genericUtility.getColumnValue("emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07 empCode = genericUtility.getColumnValue("emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07
tranID = genericUtility.getColumnValue("tran_id", dom1,"1"); tranID = genericUtility.getColumnValue("tran_id", dom1,"1");
...@@ -1788,6 +2366,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1788,6 +2366,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
rs.close(); rs.close();
// Modified by Yashwant on 03/01/2020.Start
stmt.close();
stmt = null;
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :resignDate ===============>"+resignDate); System.out.println("[FullFinalActEJB] wf_calc_np() :resignDate ===============>"+resignDate);
System.out.println("[FullFinalActEJB] wf_calc_np() :noticePrd ===============>"+noticePrd); System.out.println("[FullFinalActEJB] wf_calc_np() :noticePrd ===============>"+noticePrd);
System.out.println("[FullFinalActEJB] wf_calc_np() :relieveDateDb ===============>"+relieveDateDb); System.out.println("[FullFinalActEJB] wf_calc_np() :relieveDateDb ===============>"+relieveDateDb);
...@@ -1814,16 +2397,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1814,16 +2397,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB]relvDate===================>"+relvDate); log.write("[FullFinalActEJB]relvDate===================>"+relvDate);
log.write("[FullFinalActEJB]resignDt===================>"+resignDt); log.write("[FullFinalActEJB]resignDt===================>"+resignDt);
// Modified by Yashwant on 03/01/2020.Start
//plad = getEnv("999999","NOTICPAYON",conn); //plad = getEnv("999999","NOTICPAYON",conn);
plad = getEnv("999999","NOTICPAYON",conn); plad = admCommon.getEnv("999999","NOTICPAYON",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICPAYON\",conn) ===============>"+plad); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICPAYON\",conn) ===============>"+plad);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICPAYON\",conn) ===============>"+plad); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICPAYON\",conn) ===============>"+plad);
if(plad.trim().equals("NULLFOUND") || plad == null || plad.trim().length() == 0) if(plad.trim().equals("NULLFOUND") || plad == null || plad.trim().length() == 0)
{ {
plad = ""; plad = "";
plad = getEnv("999999","PL_ENCON",conn); // Modified by Yashwant on 03/01/2020.Start
//plad = getEnv("999999","PL_ENCON",conn);
plad = admCommon.getEnv("999999","PL_ENCON",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plad); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plad);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plad); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plad);
...@@ -1870,7 +2457,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1870,7 +2457,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
System.out.println("prdCode : " + prdCode); System.out.println("prdCode : " + prdCode);
log.write("prdCode : " + prdCode); log.write("prdCode : " + prdCode);
noticeAd = getEnv("999999","NOTICE_RCP",conn); // Modified by Yashwant on 03/01/2020.Start
//noticeAd = getEnv("999999","NOTICE_RCP",conn);
noticeAd = admCommon.getEnv("999999","NOTICE_RCP",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_RCP\",conn) ===============>"+noticeAd); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_RCP\",conn) ===============>"+noticeAd);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_RCP\",conn) ===============>"+noticeAd); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_RCP\",conn) ===============>"+noticeAd);
...@@ -1924,9 +2514,17 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1924,9 +2514,17 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] wf_calc_np() :noticeDays ===============>"+noticeDays); log.write("[FullFinalActEJB] wf_calc_np() :noticeDays ===============>"+noticeDays);
//Calendar calendar1 = Calendar.getInstance(); //Calendar calendar1 = Calendar.getInstance();
java.util.Date todayDate = new java.util.Date();
// Modified by Yashwant on 03/01/2020.Start
//java.util.Date todayDate = new java.util.Date();
Timestamp todayDate = new Timestamp(System.currentTimeMillis());
// Modified by Yashwant on 03/01/2020.End
//leaveDays = getSiteEnv("99999","ADM","X","ZZZZZ","LEAVE_DAYS",todayDate,conn); //leaveDays = getSiteEnv("99999","ADM","X","ZZZZZ","LEAVE_DAYS",todayDate,conn);
leaveDays = getEnvAdm( paySite, cadreCode, gradeCode, "LEAVE_DAYS", todayDate, conn ); // Modified by Yashwant on 03/01/2020.Start
//leaveDays = getEnvAdm( paySite, cadreCode, gradeCode, "LEAVE_DAYS", todayDate, conn );
leaveDays = admCommon.getAdmEnv( paySite, cadreCode, gradeCode, "LEAVE_DAYS", todayDate, conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :leaveDays ===============>"+leaveDays); System.out.println("[FullFinalActEJB] wf_calc_np() :leaveDays ===============>"+leaveDays);
log.write("[FullFinalActEJB] wf_calc_np() :leaveDays ===============>"+leaveDays); log.write("[FullFinalActEJB] wf_calc_np() :leaveDays ===============>"+leaveDays);
...@@ -1936,7 +2534,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -1936,7 +2534,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
leaveDays = "N"; leaveDays = "N";
} }
//absentDays = getSiteEnv("99999","ADM","X","ZZZZZ","ABSENT_DAYS",todayDate,conn); //absentDays = getSiteEnv("99999","ADM","X","ZZZZZ","ABSENT_DAYS",todayDate,conn);
absentDays = getEnvAdm(paySite,cadreCode,gradeCode,"ABSENT_DAYS",todayDate,conn);
// Modified by Yashwant on 03/01/2020.Start
//absentDays = getEnvAdm(paySite,cadreCode,gradeCode,"ABSENT_DAYS",todayDate,conn);
absentDays = admCommon.getAdmEnv( paySite, cadreCode, gradeCode, "ABSENT_DAYS", todayDate, conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :absentDays ===============>"+absentDays); System.out.println("[FullFinalActEJB] wf_calc_np() :absentDays ===============>"+absentDays);
log.write("[FullFinalActEJB] wf_calc_np() :absentDays ===============>"+absentDays); log.write("[FullFinalActEJB] wf_calc_np() :absentDays ===============>"+absentDays);
...@@ -2099,15 +2701,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2099,15 +2701,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] wf_calc_np() :noOfDays ===============>"+noOfDays); log.write("[FullFinalActEJB] wf_calc_np() :noOfDays ===============>"+noOfDays);
log.write("[FullFinalActEJB] wf_calc_np() :diffDays ===============>"+diffDays); log.write("[FullFinalActEJB] wf_calc_np() :diffDays ===============>"+diffDays);
plprop = getEnv("999999","NOTICEPAYPROP",conn); // Modified by Yashwant on 03/01/2020.Start
//plprop = getEnv("999999","NOTICEPAYPROP",conn);
plprop = admCommon.getEnv("999999","NOTICEPAYPROP",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICEPAYPROP\",conn) ===============>"+plprop); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICEPAYPROP\",conn) ===============>"+plprop);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICEPAYPROP\",conn) ===============>"+plprop); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICEPAYPROP\",conn) ===============>"+plprop);
if(plprop.trim().equals("NULLFOUND") || plprop == null || plprop.trim().length() == 0) if(plprop.trim().equals("NULLFOUND") || plprop == null || plprop.trim().length() == 0)
{ {
plprop = getEnv("999999","PL_PROP",conn); // Modified by Yashwant on 03/01/2020.Start
//plprop = getEnv("999999","PL_PROP",conn);
plprop = admCommon.getEnv("999999","PL_PROP",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop);
...@@ -2214,7 +2821,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2214,7 +2821,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
detInsert = wf_det_insert(tranID,noticeAd,descr,amount1,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount1,1); detInsert = wf_det_insert(tranID,noticeAd,descr,amount1,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount1,1);
System.out.println("After wf_det_insert called detInsert --->> [ "+detInsert+" ]"); System.out.println("After wf_det_insert called detInsert --->> [ "+detInsert+" ]");
noticeAd = ""; noticeAd = "";
noticeAd = getEnv("999999","NOTICE_PAY",conn); // Modified by Yashwant on 03/01/2020.Start
//noticeAd = getEnv("999999","NOTICE_PAY",conn);
noticeAd = admCommon.getEnv("999999","NOTICE_PAY",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_PAY\",conn) ===============>"+noticeAd); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_PAY\",conn) ===============>"+noticeAd);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_PAY\",conn) ===============>"+noticeAd); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"NOTICE_PAY\",conn) ===============>"+noticeAd);
...@@ -2499,7 +3109,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2499,7 +3109,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
continue; continue;
} }
plEncon = getEnv("999999","PL_ENCON",conn); // Modified by Yashwant on 03/01/2020.Start
//plEncon = getEnv("999999","PL_ENCON",conn);
plEncon = admCommon.getEnv("999999","PL_ENCON",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plEncash); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plEncash);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plEncash); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_ENCON\",conn) ===============>"+plEncash);
...@@ -2511,7 +3124,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2511,7 +3124,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] wf_calc_np() :errorCode ===============>"+errorCode); log.write("[FullFinalActEJB] wf_calc_np() :errorCode ===============>"+errorCode);
return errorCode; return errorCode;
} }
plprop = getEnv("999999","PL_PROP",conn);
// Modified by Yashwant on 03/01/2020.Start
//plprop = getEnv("999999","PL_PROP",conn);
plprop = admCommon.getEnv("999999","PL_PROP",conn);
// Modified by Yashwant on 03/01/2020.End
System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop); System.out.println("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop);
log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop); log.write("[FullFinalActEJB] wf_calc_np() :getEnv(\"999999\",\"PL_PROP\",conn) ===============>"+plprop);
...@@ -2668,11 +3285,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2668,11 +3285,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt1.close(); stmt1.close();
stmt1 = null; stmt1 = null;
} }
if(conn != null) // Yashwant 03/01/2020 [Use class level connection].Start
/*if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }*/
// Yashwant 03/01/2020 [Use class level connection].End
}catch(Exception e) }catch(Exception e)
{ {
System.out.println("[FullFinalActEJB] Exception : wf_calc_np(): Exception Occured =>>"+e.getMessage()); System.out.println("[FullFinalActEJB] Exception : wf_calc_np(): Exception Occured =>>"+e.getMessage());
...@@ -2701,7 +3320,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2701,7 +3320,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//int noticePrd = 0, noOfDays = 0, sumOfDays = 0, noticeDays = 0, diff = 0, daysAfter1 = 0; //int noticePrd = 0, noOfDays = 0, sumOfDays = 0, noticeDays = 0, diff = 0, daysAfter1 = 0;
java.sql.Date nullDate = null, frDate = null, toDate = null, relvDate = null, joinDate = null; java.sql.Date nullDate = null, frDate = null, toDate = null, relvDate = null, joinDate = null;
java.util.Date maxDate = null; java.util.Date maxDate = null;
Connection conn = null; // Connection conn = null;// Yashwant 03/01/2020 [Use class level connection]
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
Statement stmt = null; Statement stmt = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -2718,12 +3337,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2718,12 +3337,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//----Commented and changed connection buy Jaffar on 09-04-19[Start] //----Commented and changed connection buy Jaffar on 09-04-19[Start]
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");*/ conn = connDriver.getConnectDB("DriverITM");*/
conn = getConnection(); // conn = getConnection();// Yashwant 03/01/2020 [Use class level connection]
//----Commented and changed connection buy Jaffar on 09-04-19[End] //----Commented and changed connection buy Jaffar on 09-04-19[End]
stmt = conn.createStatement(); stmt = conn.createStatement();
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
empCode = genericUtility.getColumnValue( "emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07 empCode = genericUtility.getColumnValue( "emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07
tranID = genericUtility.getColumnValue( "tran_id", dom1,"1"); tranID = genericUtility.getColumnValue( "tran_id", dom1,"1");
...@@ -2731,9 +3353,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2731,9 +3353,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
relieveDt = genericUtility.getColumnValue( "relieve_date", dom1,"1"); relieveDt = genericUtility.getColumnValue( "relieve_date", dom1,"1");
trDate = genericUtility.getColumnValue( "tran_date", dom1,"1"); trDate = genericUtility.getColumnValue( "tran_date", dom1,"1");
java.util.Date tranDate = new java.util.Date(); java.util.Date tranDate = new java.util.Date();
java.util.Date relieveDate = new java.util.Date();
tranDate = new SimpleDateFormat( genericUtility.getApplDateFormat() ).parse( trDate ); tranDate = new SimpleDateFormat( genericUtility.getApplDateFormat() ).parse( trDate );
relieveDate = new SimpleDateFormat( genericUtility.getApplDateFormat() ).parse( relieveDt );
//Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
/*java.util.Date relieveDate = new java.util.Date();
relieveDate = new SimpleDateFormat( genericUtility.getApplDateFormat() ).parse( relieveDt );*/
Timestamp relieveDate = Timestamp.valueOf(genericUtility.getValidDateString(relieveDt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
sqlStr = "SELECT WORK_SITE, CADRE, GRADE ,RELIEVE_DATE, DATE_JOIN,PAY_SITE" + sqlStr = "SELECT WORK_SITE, CADRE, GRADE ,RELIEVE_DATE, DATE_JOIN,PAY_SITE" +
" FROM EMPLOYEE WHERE EMP_CODE = '" + empCode+ "'"; " FROM EMPLOYEE WHERE EMP_CODE = '" + empCode+ "'";
...@@ -2751,6 +3377,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2751,6 +3377,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
paySite = rs.getString("PAY_SITE"); paySite = rs.getString("PAY_SITE");
} }
rs.close(); rs.close();
stmt.close(); // Modified by Yashwant on 03/01/2020
joinDt = joinDate.toString(); joinDt = joinDate.toString();
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : workSite============>"+workSite); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : workSite============>"+workSite);
...@@ -2767,15 +3394,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2767,15 +3394,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] wf_calc_gratuity() : joinDate============>"+joinDate); log.write("[FullFinalActEJB] wf_calc_gratuity() : joinDate============>"+joinDate);
log.write("[FullFinalActEJB] wf_calc_gratuity() : paySite============>"+paySite); log.write("[FullFinalActEJB] wf_calc_gratuity() : paySite============>"+paySite);
//Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
gredAppl = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_APPLICABLE",relieveDate,conn); //gredAppl = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_APPLICABLE",relieveDate,conn);
gredAppl = admCommon.getAdmEnv(workSite,cadreCode,gradeCode,"GRATUITY_APPLICABLE",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl);
if(gredAppl.trim().equals("NULLFOUND")) if(gredAppl.trim().equals("NULLFOUND"))
{ {
gredAppl = getEnv("999999","GRATUITY_APPLICABLE",conn); //Modified by Yashwant S.on 03-01-2020[Start]
//gredAppl = getEnv("999999","GRATUITY_APPLICABLE",conn);
gredAppl = admCommon.getEnv("999999","GRATUITY_APPLICABLE",conn);
//Modified by Yashwant S.on 03-01-2020[End]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_APPLICABLE\",relieveDate,conn)============>"+gredAppl);
...@@ -2793,14 +3425,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2793,14 +3425,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("GRATUITY_APPLICABLE is :"+gredAppl+ "It should be Y :"); log.write("GRATUITY_APPLICABLE is :"+gredAppl+ "It should be Y :");
return ""; return "";
} }
minService = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_MINSERVICE",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//minService = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_MINSERVICE",relieveDate,conn);
minService = admCommon.getAdmEnv(workSite,cadreCode,gradeCode,"GRATUITY_MINSERVICE",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_MINSERVICE\",relieveDate,conn)============>"+minService); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_MINSERVICE\",relieveDate,conn)============>"+minService);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_MINSERVICE\",relieveDate,conn)============>"+minService); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_MINSERVICE\",relieveDate,conn)============>"+minService);
if(minService.trim().equals("NULLFOUND")) if(minService.trim().equals("NULLFOUND"))
{ {
minService = getEnv("999999","GRATUITY_MINSERVICE",conn); //Modified by Yashwant S.on 03-01-2020[Start]
//minService = getEnv("999999","GRATUITY_MINSERVICE",conn);
minService = admCommon.getEnv("999999","GRATUITY_MINSERVICE",conn);
//Modified by Yashwant S.on 03-01-2020[End]
if( minService.trim().equals( "NULLFOUND" ) ) if( minService.trim().equals( "NULLFOUND" ) )
{ {
errorCode = "VSENVAR1:ERROR"; errorCode = "VSENVAR1:ERROR";
...@@ -2832,7 +3471,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2832,7 +3471,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//totalYear = (int)Math.floor((float)daysDiff/365 + 0.0f);//commented by nisar on 08/12/07 //totalYear = (int)Math.floor((float)daysDiff/365 + 0.0f);//commented by nisar on 08/12/07
totalYear = (int)Math.round((float)daysDiff/365 + 0.0f); totalYear = (int)Math.round((float)daysDiff/365 + 0.0f);
daysPa = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_DAY_PA",relieveDate,conn); //Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//daysPa = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_DAY_PA",relieveDate,conn);
daysPa = admCommon.getAdmEnv(workSite,cadreCode,gradeCode,"GRATUITY_DAY_PA",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : daysPa============>"+daysPa); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : daysPa============>"+daysPa);
log.write("[FullFinalActEJB] wf_calc_gratuity() : daysPa============>"+daysPa); log.write("[FullFinalActEJB] wf_calc_gratuity() : daysPa============>"+daysPa);
...@@ -2843,7 +3485,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2843,7 +3485,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
if(daysPa.trim().equals("NULLFOUND")) if(daysPa.trim().equals("NULLFOUND"))
{ {
daysPa = getEnv("999999","GRATUITY_DAY_PA",conn); //Modified by Yashwant S.on 03-01-2020[Start]
//daysPa = getEnv("999999","GRATUITY_DAY_PA",conn);
daysPa = admCommon.getEnv("999999","GRATUITY_DAY_PA",conn);
//Modified by Yashwant S.on 03-01-2020[End]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_DAY_PA\",relieveDate,conn)============>"+daysPa); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_DAY_PA\",relieveDate,conn)============>"+daysPa);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_DAY_PA\",relieveDate,conn)============>"+daysPa); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_DAY_PA\",relieveDate,conn)============>"+daysPa);
...@@ -2855,14 +3500,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2855,14 +3500,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
} }
daysPAnum = Double.parseDouble(daysPa); daysPAnum = Double.parseDouble(daysPa);
propDays = getEnvAdm( workSite, cadreCode, gradeCode, "GRATUITY_PROPDAYS", relieveDate, conn ); //Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//propDays = getEnvAdm( workSite, cadreCode, gradeCode, "GRATUITY_PROPDAYS", relieveDate, conn );
propDays = admCommon.getAdmEnv(workSite,cadreCode,gradeCode,"GRATUITY_PROPDAYS",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_PROPDAYS\",relieveDate,conn)============>"+propDays); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_PROPDAYS\",relieveDate,conn)============>"+propDays);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_PROPDAYS\",relieveDate,conn)============>"+propDays); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_PROPDAYS\",relieveDate,conn)============>"+propDays);
if(propDays.trim().equals("NULLFOUND")) if(propDays.trim().equals("NULLFOUND"))
{ {
propDays = getEnv("999999","GRATUITY_PROPDAYS",conn); //Modified by Yashwant S.on 03-01-2020[Start]
//propDays = getEnv("999999","GRATUITY_PROPDAYS",conn);
propDays = admCommon.getEnv("999999","GRATUITY_PROPDAYS",conn);
//Modified by Yashwant S.on 03-01-2020[Start]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_PROPDAYS\",conn)============>"+propDays); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_PROPDAYS\",conn)============>"+propDays);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_PROPDAYS\",conn)============>"+propDays); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_PROPDAYS\",conn)============>"+propDays);
...@@ -2875,15 +3526,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2875,15 +3526,20 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
properDays = Double.parseDouble(propDays); properDays = Double.parseDouble(propDays);
baseAdCode = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_BASEADCODE",relieveDate,conn); //Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//baseAdCode = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_BASEADCODE",relieveDate,conn);
baseAdCode = admCommon.getAdmEnv(workSite,cadreCode,gradeCode,"GRATUITY_BASEADCODE",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_BASEADCODE\",relieveDate,conn)============>"+baseAdCode); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_BASEADCODE\",relieveDate,conn)============>"+baseAdCode);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_BASEADCODE\",relieveDate,conn)============>"+baseAdCode); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_BASEADCODE\",relieveDate,conn)============>"+baseAdCode);
if(baseAdCode.trim().equals("NULLFOUND")) if(baseAdCode.trim().equals("NULLFOUND"))
{ {
baseAdCode = getEnv("999999","GRATUITY_BASEADCODE",conn); //Modified by Yashwant S.on 03-01-2020[Start]
//baseAdCode = getEnv("999999","GRATUITY_BASEADCODE",conn);
baseAdCode = admCommon.getEnv("999999","GRATUITY_BASEADCODE",conn);
//Modified by Yashwant S.on 03-01-2020[End]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_BASEADCODE\",conn)==>"+baseAdCode); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_BASEADCODE\",conn)==>"+baseAdCode);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_BASEADCODE\",conn)==>"+baseAdCode); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnv(\"999999\",\"GRATUITY_BASEADCODE\",conn)==>"+baseAdCode);
...@@ -2952,13 +3608,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -2952,13 +3608,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
rs.close(); rs.close();
adCode = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_ADCODE",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//adCode = getEnvAdm(workSite,cadreCode,gradeCode,"GRATUITY_ADCODE",relieveDate,conn);
adCode = admCommon.getAdmEnv(workSite,cadreCode,gradeCode,"GRATUITY_ADCODE",relieveDate,conn);
//Modified by Yashwant S.on 03-01-2020[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_ADCODE\",relieveDate,conn)============>"+adCode); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_ADCODE\",relieveDate,conn)============>"+adCode);
log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_ADCODE\",relieveDate,conn)============>"+adCode); log.write("[FullFinalActEJB] wf_calc_gratuity() : getEnvAdm(workSite,cadreCode,gradeCode,\"GRATUITY_ADCODE\",relieveDate,conn)============>"+adCode);
if(adCode.trim().equals("NULLFOUND")) if(adCode.trim().equals("NULLFOUND"))
{ {
adCode = getEnv( "999999", "GRATUITY_ADCODE", conn); //Modified by Yashwant S.on 03-01-2020[Start]
//adCode = getEnv( "999999", "GRATUITY_ADCODE", conn);
adCode = admCommon.getEnv("999999","GRATUITY_ADCODE",conn);
//Modified by Yashwant S.on 03-01-2020[End]
System.out.println("[FullFinalActEJB] wf_calc_gratuity() : GRATUITY_ADCODE============>"+adCode); System.out.println("[FullFinalActEJB] wf_calc_gratuity() : GRATUITY_ADCODE============>"+adCode);
log.write("[FullFinalActEJB] wf_calc_gratuity() : GRATUITY_ADCODE============>"+adCode); log.write("[FullFinalActEJB] wf_calc_gratuity() : GRATUITY_ADCODE============>"+adCode);
...@@ -3095,11 +3759,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3095,11 +3759,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt.close(); stmt.close();
stmt = null; stmt = null;
} }
// Yashwant 03/01/2020 [Use class level connection].Start
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
// Yashwant 03/01/2020 [Use class level connection].End
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -3111,7 +3779,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3111,7 +3779,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
} }
return detInsertString; return detInsertString;
} }
private String getEnv(String prdCode, String varName, Connection conn)throws RemoteException,ITMException /*private String getEnv(String prdCode, String varName, Connection conn)throws RemoteException,ITMException
{ {
String varValue = ""; String varValue = "";
String sql = ""; String sql = "";
...@@ -3147,13 +3815,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3147,13 +3815,13 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
{ {
//System.out.println("Closing Connection....."); //System.out.println("Closing Connection.....");
//commented by msalam on 26/11/07 as not needed //commented by msalam on 26/11/07 as not needed
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
//commented by msalam on 26/11/07 as not needed //commented by msalam on 26/11/07 as not needed
} }
catch(Exception e) catch(Exception e)
...@@ -3168,6 +3836,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3168,6 +3836,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("Returning Value From getEnv() :: "+varValue); log.write("Returning Value From getEnv() :: "+varValue);
return varValue; return varValue;
} }
private String getSiteEnv(String siteCode, String modName, String levelType, String levelCode, String parName, java.util.Date adDate, Connection conn)throws RemoteException,ITMException private String getSiteEnv(String siteCode, String modName, String levelType, String levelCode, String parName, java.util.Date adDate, Connection conn)throws RemoteException,ITMException
{ {
String varValue = ""; String varValue = "";
...@@ -3179,7 +3848,12 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3179,7 +3848,12 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
try try
{ {
log.write("===================getSiteEnv() method called======================="); log.write("===================getSiteEnv() method called=======================");
GenericUtility genericUtility = GenericUtility.getInstance();
//Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
stmt = conn.createStatement(); stmt = conn.createStatement();
...@@ -3270,20 +3944,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3270,20 +3944,21 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("Returning Value From getSiteEnv() :: "+varValue); log.write("Returning Value From getSiteEnv() :: "+varValue);
return varValue; return varValue;
} }
private String getEnvAdm(String siteCode, String cadreCode, String gradeCode, String envName, java.util.Date adDate, Connection conn)throws RemoteException,ITMException private String getEnvAdm(String siteCode, String cadreCode, String gradeCode, String envName, java.util.Date adDate, Connection conn)throws RemoteException,ITMException
{ {
String varValue = ""; String varValue = "";
String sql = ""; String sql = "";
//boolean connectionState = false; boolean connectionState = false;
try try
{ {
log.write("===================getEnvAdm() method called======================="); log.write("===================getEnvAdm() method called=======================");
/*if(conn == null) if(conn == null)
{ {
conn = getConnection(); conn = getConnection();
connectionState = true; connectionState = true;
}*/ }
varValue = getSiteEnv(siteCode,"ADM","G",gradeCode,envName,adDate,conn); varValue = getSiteEnv(siteCode,"ADM","G",gradeCode,envName,adDate,conn);
if(varValue.trim().equals("NULLFOUND")) if(varValue.trim().equals("NULLFOUND"))
...@@ -3317,6 +3992,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3317,6 +3992,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("Returning Value From getEnvAdm() :: "+varValue); log.write("Returning Value From getEnvAdm() :: "+varValue);
return varValue; return varValue;
} }
*/
private int daysAfter( String startDt, String endDt )throws RemoteException , ITMException private int daysAfter( String startDt, String endDt )throws RemoteException , ITMException
{ {
java.util.Date joinDate = new java.util.Date(); java.util.Date joinDate = new java.util.Date();
...@@ -3334,7 +4010,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3334,7 +4010,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("startDt in [daysAfter]..:: " + startDt); log.write("startDt in [daysAfter]..:: " + startDt);
log.write("endDt in [daysAfter]..:: " + endDt); log.write("endDt in [daysAfter]..:: " + endDt);
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
if((startDt!=null && endDt!=null) && (startDt.trim().length() > 0 && endDt.trim().length()>0)) if((startDt!=null && endDt!=null) && (startDt.trim().length() > 0 && endDt.trim().length()>0))
{ {
...@@ -3376,7 +4055,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3376,7 +4055,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] calcOfRelativeDate() method called-----------------------"); log.write("[FullFinalActEJB] calcOfRelativeDate() method called-----------------------");
mService = Integer.parseInt(minService); mService = Integer.parseInt(minService);
GenericUtility genericUtility = GenericUtility.getInstance(); //Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
System.out.println("[FullFinalActEJB] calcOfRelativeDate() : joinDt(YYYY/MM/DD)================>"+joinDt); System.out.println("[FullFinalActEJB] calcOfRelativeDate() : joinDt(YYYY/MM/DD)================>"+joinDt);
log.write("[FullFinalActEJB] calcOfRelativeDate() : joinDt(YYYY/MM/DD)================>"+joinDt); log.write("[FullFinalActEJB] calcOfRelativeDate() : joinDt(YYYY/MM/DD)================>"+joinDt);
...@@ -3414,10 +4096,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3414,10 +4096,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//wf_det_insert(tranID,noticeAd,descr,amount1,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount1,1); //wf_det_insert(tranID,noticeAd,descr,amount1,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount1,1);
private String wf_det_insert(String tranID, String adCodeInt, String descr, double intAmt, java.util.Date startDate, String refType, String refNo, String acctCodeSale, String cctrCode, String remarks, String refSer, String refNo1, String currCode, double exchRate, double netAmt, double dailyExchrate)throws RemoteException , ITMException private String wf_det_insert(String tranID, String adCodeInt, String descr, double intAmt, java.util.Date startDate, String refType, String refNo, String acctCodeSale, String cctrCode, String remarks, String refSer, String refNo1, String currCode, double exchRate, double netAmt, double dailyExchrate)throws RemoteException , ITMException
{ {
StringBuffer valueXmlString = new StringBuffer("<Detail>\r\n"); StringBuffer valueXmlString = new StringBuffer("<Detail>\r\n");
String sqlStr = "", acctDescr = "",startDateStr = ""; String sqlStr = "", acctDescr = "",startDateStr = "";
Connection conn = null; // Connection conn = null; // Yashwant 03/01/2020 [Use class level connection]
Statement stmt = null; Statement stmt = null;
ResultSet rs = null; ResultSet rs = null;
try try
...@@ -3428,7 +4109,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3428,7 +4109,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
if(startDate!=null) if(startDate!=null)
{ //added by nisar on 27/11/07 { //added by nisar on 27/11/07
System.out.println("in condition of wf_det_insert method-------->>"); System.out.println("in condition of wf_det_insert method-------->>");
GenericUtility genericUtility = GenericUtility.getInstance(); ////Modified by Yashwant S.on 24-12-19[Start][CCF No: IT2018-015 / Request ID: A18CSUN011]
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Yashwant S.on 24-12-19[End][CCF No: IT2018-015 / Request ID: A18CSUN011]
Object obj = new SimpleDateFormat(genericUtility.getDBDateFormat()).parse(startDate.toString()); //added by nisar on 27/11/07 Object obj = new SimpleDateFormat(genericUtility.getDBDateFormat()).parse(startDate.toString()); //added by nisar on 27/11/07
startDateStr = (new SimpleDateFormat(genericUtility.getApplDateFormat()).format(obj)).toString();//added by nisar on 27/11/07 startDateStr = (new SimpleDateFormat(genericUtility.getApplDateFormat()).format(obj)).toString();//added by nisar on 27/11/07
} }
...@@ -3439,7 +4123,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3439,7 +4123,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//----Commented and changed connection buy Jaffar on 09-04-19[Start] //----Commented and changed connection buy Jaffar on 09-04-19[Start]
/*ConnDriver connDriver = new ConnDriver(); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");*/ conn = connDriver.getConnectDB("DriverITM");*/
conn = getConnection(); // conn = getConnection();// Yashwant 03/01/2020 [Use class level connection]
//----Commented and changed connection buy Jaffar on 09-04-19[End] //----Commented and changed connection buy Jaffar on 09-04-19[End]
stmt = conn.createStatement(); stmt = conn.createStatement();
...@@ -3512,11 +4196,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3512,11 +4196,15 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt.close(); stmt.close();
stmt = null; stmt = null;
} }
// Yashwant 03/01/2020 [Use class level connection].Start
/*
if(conn != null) if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }
*/
// Yashwant 03/01/2020 [Use class level connection].End
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -3597,6 +4285,30 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3597,6 +4285,30 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
System.out.println(">>>inside catch block geting exception<<<"); System.out.println(">>>inside catch block geting exception<<<");
remarks = orgRemarks; remarks = orgRemarks;
} }
// Modified by Yashwant on 03/01/2020.Start
finally
{
try
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pst != null)
{
pst.close();
pst = null;
}
}
catch(Exception e)
{
System.out.println("[FullFinalActEJB] Exception : getRemarksByFunction(): Exception Occured =>>"+e.getMessage());
log.write("[FullFinalActEJB] Exception : getRemarksByFunction(): Exception Occured =>>"+e.getMessage());
e.printStackTrace();
}
}
// Modified by Yashwant on 03/01/2020.End
System.out.println(">>>final return value of remarks is::"+remarks); System.out.println(">>>final return value of remarks is::"+remarks);
return remarks; return remarks;
} }
...@@ -3755,4 +4467,3 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal, ...@@ -3755,4 +4467,3 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//Added by RAHUL SHENOY on 24/08/2015 [Getting the deleted Row count].End //Added by RAHUL SHENOY on 24/08/2015 [Getting the deleted Row count].End
} }
\ No newline at end of file
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