Skip to content

B
business-java
Commit 0a1623e6 authored by pbhosale's avatar pbhosale
Browse files
Options

Updated Components on [18/10/19] 

arrears_deletion11.xml
d_arrears_deletion_filt.srd
ArrearsDeletePrc.java
ArrearsDeleteIC.java
ArrearsDeleteICLocal.java
ArrearsDeleteICRemote.java
A18FSUN004.sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@210040 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ce70cf6f
Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 41 deletions
webitm-adm/module-resource/SQL/A18FSUN004.sql 0 → 100644
View file @ 0a1623e6
update transetup set edit_expr = 'and payarr_to_proc.status not in(''D'')' where tran_window = 'w_payarr_to_proc';
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION)
values ('DELRECO ',' Record Deleted !','You can not insert the record because record is already disable','E','Y',null,null,null,to_date('25-SEP-19','DD-MON-RR'),'BASE ','BASE ',null,null);
update SYSTEM_EVENTS set SERVICE_CODE = 'poic_default_ejb', COMP_TYPE = 'JB', COMP_NAME = 'ibase.webitm.ejb.adm.ArrearsDeleteIC' where OBJ_NAME = 'arrears_deletion' and EVENT_CODE = 'post_item_change';
update SYSTEM_EVENTS set SERVICE_CODE = 'prv_default_ejb', COMP_TYPE = 'JB', COMP_NAME = 'ibase.webitm.ejb.adm.ArrearsDeleteIC' where OBJ_NAME = 'arrears_deletion' and EVENT_CODE = 'pre_validate';
update SYSTEM_EVENTS set SERVICE_CODE = 'prc_default_ejb', COMP_TYPE = 'JB', COMP_NAME = 'ibase.webitm.ejb.adm.adv.ArrearsDeletePrc' where OBJ_NAME = 'arrears_deletion' and EVENT_CODE = 'process';
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('arrears_deletion','1','prd_code__acc',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('arrears_deletion','1','site_code__fr',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('arrears_deletion','1','type',null);
webitm-adm/module-resource/metadata/arrears_deletion11.xml
View file @ 0a1623e6
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<text>Basic</text> <text>Basic</text>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>23</x> <x>25</x>
<y>18</y> <y>19</y>
<height>197</height> <height>197</height>
<width>463</width> <width>463</width>
<name>gb_1</name> <name>gb_1</name>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<x>166</x> <x>166</x>
<y>38</y> <y>38</y>
<height>16</height> <height>16</height>
<width>66</width> <width>151</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
<limit>0</limit> <limit>0</limit>
<allowedit>no</allowedit> <allowedit>no</allowedit>
<case>any</case> <case>any</case>
<useasborder>yes</useasborder>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
......
webitm-adm/module-resource/srd/d_arrears_deletion_filt.srd
View file @ 0a1623e6
...@@ -15,9 +15,9 @@ table(column=(type=char(6) updatewhereclause=no name=prd_code__fr dbname="prd_co ...@@ -15,9 +15,9 @@ table(column=(type=char(6) updatewhereclause=no name=prd_code__fr dbname="prd_co
column=(type=char(10) updatewhereclause=no name=type dbname="type" initial="AR" values="Arrears AR/Payroll PY/" ) column=(type=char(10) updatewhereclause=no name=type dbname="type" initial="AR" values="Arrears AR/Payroll PY/" )
column=(type=char(10) updatewhereclause=no name=proc_group__fr dbname="proc_group__fr" ) column=(type=char(10) updatewhereclause=no name=proc_group__fr dbname="proc_group__fr" )
) )
groupbox(band=detail text="Basic"border="5" color="33554432" x="23" y="18" height="197" width="463" name=gb_1 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) groupbox(band=detail text="Basic"border="5" color="33554432" x="25" y="19" height="197" width="463" name=gb_1 visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=detail alignment="1" text="Type :" border="5" color="0" x="59" y="38" height="16" width="100" html.valueishtml="0" name=type_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" ) text(band=detail alignment="1" text="Type :" border="5" color="0" x="59" y="38" height="16" width="100" html.valueishtml="0" name=type_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=9 alignment="0" tabsequence=10 border="5" color="0" x="166" y="38" height="16" width="66" format="[general]" html.valueishtml="0" name=type visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" ) column(band=detail id=9 alignment="0" tabsequence=10 border="5" color="0" x="166" y="38" height="16" width="151" format="[general]" html.valueishtml="0" name=type visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.useasborder=yes ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=5 alignment="0" tabsequence=20 border="5" color="0" x="165" y="65" height="16" width="66" format="[general]" html.valueishtml="0" name=emp_code__fr visible="1" edit.limit=10 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=5 alignment="0" tabsequence=20 border="5" color="0" x="165" y="65" height="16" width="66" format="[general]" html.valueishtml="0" name=emp_code__fr visible="1" edit.limit=10 edit.case=upper edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Employee From :" border="5" color="0" x="59" y="64" height="15" width="100" html.valueishtml="0" name=emp_code__fr_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" ) text(band=detail alignment="1" text="Employee From :" border="5" color="0" x="59" y="64" height="15" width="100" html.valueishtml="0" name=emp_code__fr_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=detail alignment="1" text="Site From :" border="5" color="0" x="59" y="89" height="16" width="100" html.valueishtml="0" name=site_code__fr_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" ) text(band=detail alignment="1" text="Site From :" border="5" color="0" x="59" y="89" height="16" width="100" html.valueishtml="0" name=site_code__fr_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
......
webitm-adm/src/ibase/webitm/ejb/adm/ArrearsDeleteIC.java
View file @ 0a1623e6
...@@ -9,6 +9,8 @@ import java.sql.PreparedStatement; ...@@ -9,6 +9,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.ArrayList; import java.util.ArrayList;
import javax.ejb.Stateless;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
...@@ -16,7 +18,7 @@ import org.w3c.dom.NodeList; ...@@ -16,7 +18,7 @@ import org.w3c.dom.NodeList;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
@Stateless
public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemote, ArrearsDeleteICLocal public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemote, ArrearsDeleteICLocal
{ {
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
...@@ -329,6 +331,8 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo ...@@ -329,6 +331,8 @@ public class ArrearsDeleteIC extends ValidatorEJB implements ArrearsDeleteICRemo
if ("itm_default".equalsIgnoreCase(currentColumn)) if ("itm_default".equalsIgnoreCase(currentColumn))
{ {
System.out.println("currentColumn1:::::" + currentColumn); System.out.println("currentColumn1:::::" + currentColumn);
//Added by Varsha V on 17-10-19 to set AR by default.
valueXmlString.append( "<type><![CDATA[" ).append("AR").append( "]]></type>\r\n" );
valueXmlString.append( "<site_code__fr><![CDATA[" ).append(loginSiteCode).append( "]]></site_code__fr>\r\n" ); valueXmlString.append( "<site_code__fr><![CDATA[" ).append(loginSiteCode).append( "]]></site_code__fr>\r\n" );
valueXmlString.append( "<site_code__to><![CDATA[" ).append(loginSiteCode).append( "]]></site_code__to>\r\n" ); valueXmlString.append( "<site_code__to><![CDATA[" ).append(loginSiteCode).append( "]]></site_code__to>\r\n" );
} }
......
webitm-adm/src/ibase/webitm/ejb/adm/ArrearsDeleteICLocal.java
View file @ 0a1623e6
...@@ -2,9 +2,11 @@ package ibase.webitm.ejb.adm; ...@@ -2,9 +2,11 @@ package ibase.webitm.ejb.adm;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import javax.ejb.Local;
import ibase.webitm.ejb.ValidatorLocal; import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
@Local
public interface ArrearsDeleteICLocal extends ValidatorLocal public interface ArrearsDeleteICLocal extends ValidatorLocal
{ {
public String wfValData() throws RemoteException,ITMException; public String wfValData() throws RemoteException,ITMException;
......
webitm-adm/src/ibase/webitm/ejb/adm/ArrearsDeleteICRemote.java
View file @ 0a1623e6
...@@ -2,9 +2,11 @@ package ibase.webitm.ejb.adm; ...@@ -2,9 +2,11 @@ package ibase.webitm.ejb.adm;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import javax.ejb.Remote;
import ibase.webitm.ejb.ValidatorRemote; import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
@Remote
public interface ArrearsDeleteICRemote extends ValidatorRemote public interface ArrearsDeleteICRemote extends ValidatorRemote
{ {
public String wfValData() throws RemoteException,ITMException; public String wfValData() throws RemoteException,ITMException;
......
webitm-adm/src/ibase/webitm/ejb/adm/adv/ArrearsDeletePrc.java
View file @ 0a1623e6
...@@ -11,15 +11,18 @@ import java.sql.ResultSet; ...@@ -11,15 +11,18 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
//import java.sql.Statement; //import java.sql.Statement;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB; import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.adm.AdmCommon; import ibase.webitm.ejb.adm.AdmCommon;
import ibase.webitm.ejb.adm.HRLogWriter;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
...@@ -27,13 +30,27 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -27,13 +30,27 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
{ {
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
HRLogWriter hrLogWriter = null; //Added By Poonam B [18/10/2019]
public String process(String xmlString,String xmlString1,String objContext,String xtraParams) throws RemoteException,ITMException public String process(String xmlString,String xmlString1,String objContext,String xtraParams) throws RemoteException,ITMException
{ {
Document detailDom = null; Document detailDom = null;
Document headerDom = null; Document headerDom = null;
String retStr = ""; String retStr = "";
//Added By Poonam B [18/10/2019][START]
String userId = "", chgTerm = "", loginSite = "",jobId = "", objName = "";
String type = "";
Connection conn = null;
Connection logConn = null;
hrLogWriter = new HRLogWriter();
//Added By Poonam B [18/10/2019][END]
try try
{ {
//Added By Poonam B [18/10/2019][START]
conn = getConnection();
logConn = getConnection();
System.out.println("Conn ["+conn+"]");
System.out.println("logConn ["+logConn+"]");
//Added By Poonam B [18/10/2019][END]
if(xmlString != null && xmlString.trim().length()!=0) if(xmlString != null && xmlString.trim().length()!=0)
{ {
headerDom = genericUtility.parseString(xmlString); headerDom = genericUtility.parseString(xmlString);
...@@ -44,7 +61,33 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -44,7 +61,33 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
detailDom = genericUtility.parseString(xmlString1); detailDom = genericUtility.parseString(xmlString1);
System.out.println("detailDom" + xmlString1); System.out.println("detailDom" + xmlString1);
} }
retStr = process(headerDom, detailDom, objContext, xtraParams); //Added By Poonam B [18/10/2019][START][To generate Log]
userId = E12GenericUtility.checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = E12GenericUtility.checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
loginSite = E12GenericUtility.checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
jobId = E12GenericUtility.checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "job_id"));
objName = getObjNameFromDom(headerDom, "objName");
logConn = getConnection();
hrLogWriter.setTotalRows(0);
hrLogWriter.setRowsProcessed(0);
hrLogWriter.setRowsIgnored(0);
hrLogWriter.setRowsRejected(0);
type = E12GenericUtility.checkNull(genericUtility.getColumnValue("type", headerDom));
System.out.println("type ===" +type);
if("AR".equalsIgnoreCase(type))
{
hrLogWriter.setProcessId("ArrearsDelete");
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, "ArrearsDelete", "ARREARSDELETE", loginSite, logConn);
}
else
{
hrLogWriter.setProcessId("PayrollDelete");
hrLogWriter.initializeHRLogWriter(objName, jobId, userId, chgTerm, "PayrollDelete", "PAYROLLDELETE", loginSite, logConn);
}
retStr = processData(headerDom, detailDom, objContext, xtraParams,hrLogWriter,conn,logConn);
System.out.println("Process for ArrearsDeletePrc :::: " + retStr);
//Added By Poonam B [18/10/2019][END][To generate Log]
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -52,9 +95,32 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -52,9 +95,32 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally
{
try
{
if(conn != null)
{
conn.close();
conn = null;
}
if(logConn != null)
{
logConn.close();
logConn = null;
}
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
}
return retStr; return retStr;
} }
public String process(Document headerDom, Document detailDom, String objContext, String xtraParams)throws RemoteException, ITMException //Commented By Poonam B [18/10/2019][START][Connection is generated in above process()so again no need to generate]
/*public String process(Document headerDom, Document detailDom, String objContext, String xtraParams)throws RemoteException, ITMException
{ {
String retStr=""; String retStr="";
Connection con=null; Connection con=null;
...@@ -86,16 +152,21 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -86,16 +152,21 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
} }
} }
return retStr; return retStr;
} }*/
public String processData(Document headerDom , Document detailDom,String objContext ,String xtraParams , Connection con ) throws ITMException //Commented By Poonam B [18/10/2019][END][Connection is generated in above process()so again no need to generate]
public String processData(Document headerDom , Document detailDom,String objContext ,String xtraParams ,HRLogWriter hrLogWriter, Connection con, Connection logConn) throws ITMException
{ {
String prdCodeAcct = "", prdCodeFr = "",prdCodeTo="" ,empCodeFr="",empCodeTo =""; String prdCodeAcct = "", prdCodeFr = "",prdCodeTo="" ,empCodeFr="",empCodeTo ="";
String siteCodeFr = "", siteCodeTo = "", prcGrpFr = "", prcGrpTo = ""; String siteCodeFr = "", siteCodeTo = "", prcGrpFr = "", prcGrpTo = "";
String prdCode = "",empCode="",siteCodePay="",prcGrp="",prdAccountCode="" , errorString = ""; String prdCode = "",empCode="",siteCodePay="",prcGrp="",prdAccountCode="" , errorString = "";
String type = ""; //Added By Poonam B[25-SEP-2019] String type = ""; //Added By Poonam B[25-SEP-2019]
SimpleDateFormat sdf = null; //Added By Poonam B[18-OCT-2019]
PreparedStatement pStmt = null, pstmt2 = null; PreparedStatement pStmt = null, pstmt2 = null;
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
int count; int count;
int liRet = 0; //Added By Poonam B[18-OCT-2019]
String lsLogStr = "";//Added By Poonam B[18-OCT-2019]
String userId ="", chgTerm = "",errString = ""; String userId ="", chgTerm = "",errString = "";
boolean isSuccess = false; boolean isSuccess = false;
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
...@@ -158,10 +229,47 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -158,10 +229,47 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
//Modified By Poonam B[25-SEP-2019][START] //Modified By Poonam B[25-SEP-2019][START]
type = E12GenericUtility.checkNull(genericUtility.getColumnValue("type", headerDom)); type = E12GenericUtility.checkNull(genericUtility.getColumnValue("type", headerDom));
System.out.println("type ===>" +type); System.out.println("type ===>" +type);
//Modified by Poonam B[18/10/2019][START]
if("AR".equalsIgnoreCase(type))
{
hrLogWriter.setCurrentProcess("Arrears Deletion");
liRet = hrLogWriter.getLogWriterFlag();
if(liRet < 0)
{
System.out.println(hrLogWriter.getErrorCode());
return hrLogWriter.getErrorCode();
}else
{
hrLogWriter.setStatusType("I");
hrLogWriter.setCurrentProcess("Arrears Deletion");
hrLogWriter.setActivity("Arrears Deletion");
lsLogStr = "Arrears Deletion Process Started";
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn);
}
}
else
{
hrLogWriter.setCurrentProcess("Payroll Deletion");
liRet = hrLogWriter.getLogWriterFlag();
if(liRet < 0)
{
System.out.println(hrLogWriter.getErrorCode());
return hrLogWriter.getErrorCode();
}else
{
hrLogWriter.setStatusType("I");
hrLogWriter.setCurrentProcess("Payroll Deletion");
hrLogWriter.setActivity("Payroll Deletion");
lsLogStr = "Payroll Deletion Process Started";
hrLogWriter.gbfErrWrite("", "",type, lsLogStr, "I", logConn);
}
}
//Modified by Poonam B[18/10/2019][END]
sqlPrd = "SELECT FR_DATE, TO_DATE FROM PERIOD WHERE CODE = ?"; sqlPrd = "SELECT FR_DATE, TO_DATE FROM PERIOD WHERE CODE = ?";
pstmt2 = con.prepareStatement(sqlPrd); pstmt2 = con.prepareStatement(sqlPrd);
if("AR".equalsIgnoreCase(type)) if("AR".equalsIgnoreCase(type))
{ {
/*sql.append("SELECT ARREARS.PRD_CODE,ARREARS.EMP_CODE,ARREARS.SITE_CODE__PAY,EMPLOYEE.PROC_GROUP,ARREARS.PRD_CODE__ACC FROM ARREARS,EMPLOYEE"); /*sql.append("SELECT ARREARS.PRD_CODE,ARREARS.EMP_CODE,ARREARS.SITE_CODE__PAY,EMPLOYEE.PROC_GROUP,ARREARS.PRD_CODE__ACC FROM ARREARS,EMPLOYEE");
sql.append(" WHERE ( ARREARS.EMP_CODE = EMPLOYEE.EMP_CODE ) AND ( ( ARREARS.PRD_CODE >= ? ) "); sql.append(" WHERE ( ARREARS.EMP_CODE = EMPLOYEE.EMP_CODE ) AND ( ( ARREARS.PRD_CODE >= ? ) ");
sql.append(" AND ( ARREARS.PRD_CODE <= ? ) AND ( ARREARS.EMP_CODE >= ? ) AND"); sql.append(" AND ( ARREARS.PRD_CODE <= ? ) AND ( ARREARS.EMP_CODE >= ? ) AND");
...@@ -177,17 +285,17 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -177,17 +285,17 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
// Modified on 16/10/2019.Start // Modified on 16/10/2019.Start
/* /*
deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')"; deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')";
*/ */
deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( ARREARS.VOUCHER_NO IS NULL ) AND (CASE WHEN ARREARS.CONFIRMED IS NULL THEN 'N' ELSE ARREARS.CONFIRMED END != 'Y')"; deleteSql="DELETE FROM ARREARS WHERE PRD_CODE=? AND EMP_CODE=? AND PRD_CODE__ACC=? AND ( ARREARS.VOUCHER_NO IS NULL ) AND (CASE WHEN ARREARS.CONFIRMED IS NULL THEN 'N' ELSE ARREARS.CONFIRMED END != 'Y')";
// Modified on 16/10/2019.End // Modified on 16/10/2019.End
}else { }else {
sql.append("SELECT PAYROLL.PRD_CODE,PAYROLL.EMP_CODE,PAYROLL.SITE_CODE__PAY,EMPLOYEE.PROC_GROUP FROM PAYROLL,EMPLOYEE"); sql.append("SELECT PAYROLL.PRD_CODE,PAYROLL.EMP_CODE,PAYROLL.SITE_CODE__PAY,EMPLOYEE.PROC_GROUP FROM PAYROLL,EMPLOYEE");
sql.append(" WHERE ( PAYROLL.EMP_CODE = EMPLOYEE.EMP_CODE ) AND ( ( PAYROLL.PRD_CODE >= ? ) "); sql.append(" WHERE ( PAYROLL.EMP_CODE = EMPLOYEE.EMP_CODE ) AND ( ( PAYROLL.PRD_CODE >= ? ) ");
sql.append(" AND ( PAYROLL.PRD_CODE <= ? ) AND ( PAYROLL.EMP_CODE >= ? ) AND"); sql.append(" AND ( PAYROLL.PRD_CODE <= ? ) AND ( PAYROLL.EMP_CODE >= ? ) AND");
sql.append("(PAYROLL.EMP_CODE <= ?) AND ( PAYROLL.SITE_CODE__PAY >= ?) AND (PAYROLL.SITE_CODE__PAY <= ?) AND (EMPLOYEE.PROC_GROUP >= ?) AND "); sql.append("(PAYROLL.EMP_CODE <= ?) AND ( PAYROLL.SITE_CODE__PAY >= ?) AND (PAYROLL.SITE_CODE__PAY <= ?) AND (EMPLOYEE.PROC_GROUP >= ?) AND ");
sql.append("( EMPLOYEE.PROC_GROUP <= ?) AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y'))"); sql.append("( EMPLOYEE.PROC_GROUP <= ?) AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y'))");
deleteSql = "DELETE FROM PAYROLL WHERE PRD_CODE = ? AND EMP_CODE = ? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')"; deleteSql = "DELETE FROM PAYROLL WHERE PRD_CODE = ? AND EMP_CODE = ? AND ( PAYROLL.VOUCHER_NO IS NULL ) AND (CASE WHEN PAYROLL.CONFIRMED IS NULL THEN 'N' ELSE PAYROLL.CONFIRMED END != 'Y')";
} }
//Modified By Poonam B[25-SEP-2019][END] //Modified By Poonam B[25-SEP-2019][END]
...@@ -218,7 +326,7 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -218,7 +326,7 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
} }
System.out.println("###Sai:"+prdCode+"\t"+empCode+"\t"+siteCodePay+"\t"+prcGrp+"\t" + "prdAccountCode\t" +prdAccountCode); System.out.println("###Sai:"+prdCode+"\t"+empCode+"\t"+siteCodePay+"\t"+prcGrp+"\t" + "prdAccountCode\t" +prdAccountCode);
count = 0; count = 0;
pStmt1.setString(1, prdCode); pStmt1.setString(1, prdCode);
pStmt1.setString(2, empCode); pStmt1.setString(2, empCode);
if("AR".equalsIgnoreCase(type)) if("AR".equalsIgnoreCase(type))
...@@ -228,7 +336,20 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -228,7 +336,20 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
count= pStmt1.executeUpdate(); count= pStmt1.executeUpdate();
System.out.println("Data deleted:" +count); System.out.println("Data deleted:" +count);
pStmt1.clearParameters(); pStmt1.clearParameters();
//Modified by Poonam B[18/10/2019][START]
pstmt2.setString(1, prdCode);
rs1 = pstmt2.executeQuery();
if(rs1.next())
{
frDate = rs1.getTimestamp("FR_DATE");
toDate = rs1.getTimestamp("TO_DATE");
}
if(rs1!=null)
{
rs1.close();
rs1= null;
}
//Modified by Poonam B[18/10/2019][END]
if(count > 0) if(count > 0)
{ {
// Modified on 16/10/2019.Start // Modified on 16/10/2019.Start
...@@ -236,37 +357,37 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -236,37 +357,37 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
{ {
pstmt3.setString(1, prdCode); pstmt3.setString(1, prdCode);
pstmt3.setString(2, empCode); pstmt3.setString(2, empCode);
int count2 = pStmt3.executeUpdate(); int count2 = pstmt3.executeUpdate();
pStmt3.clearParameters(); pstmt3.clearParameters();
System.out.println("Payarrtoproc deleted in case of payroll: " +count2); System.out.println("Payarrtoproc deleted in case of payroll: " +count2);
} }
else else
{ {
// Modified on 16/10/2019.End // Modified on 16/10/2019.End
pstmt2.setString(1, prdCode); //Modified by Poonam B[18/10/2019][START]
rs1 = pstmt2.executeQuery(); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
if(rs1.next()) String frDateStr = sdf.format(frDate);
{ String toDateStr = sdf.format(toDate);
frDate = rs1.getTimestamp("FR_DATE"); errString = admCommon.payarrToProcUpdation(prdCode, prdCode, empCode, empCode, type, "w_arrears_deletion", chgTerm, "", 0.0, frDateStr, toDateStr, xtraParams, con);
toDate = rs1.getTimestamp("TO_DATE");
}
if(rs1!=null)
{
rs1.close();
rs1= null;
}
pstmt2.clearParameters();
errString = payarrToProcUpdation( prdCode, prdCode, empCode, empCode, type, "w_arrears_deletion", chgTerm , "",0.0,frDate,toDate, xtraParams, con);
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con); errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con);
return errString; return errString;
} }
//Modified by Poonam B[18/10/2019][END]
}
pstmt2.clearParameters();
errString = payarrToProcUpdation( prdCode, prdCode, empCode, empCode, type, "w_arrears_deletion", chgTerm , "",0.0,frDate,toDate, xtraParams, con);
if (errString != null && errString.trim().length() > 0)
{
errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con);
return errString;
} }
isSuccess = true;
System.out.println("payarrToProcUpdation() successfully executed" +errString);
} }
isSuccess = true;
System.out.println("payarrToProcUpdation() successfully executed" +errString);
} }
if(pstmt2!=null) if(pstmt2!=null)
{ {
pstmt2.clearParameters(); pstmt2.clearParameters();
...@@ -292,10 +413,10 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -292,10 +413,10 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
//Added By Poonam B[25-SEP-2019][END] //Added By Poonam B[25-SEP-2019][END]
// Modified on 16/10/2019.Start // Modified on 16/10/2019.Start
if(pStmt3 !=null) if(pstmt3 !=null)
{ {
pStmt3.close(); pstmt3.close();
pStmt3 = null; pstmt3 = null;
} }
// Modified on 16/10/2019.End // Modified on 16/10/2019.End
if(isSuccess) if(isSuccess)
...@@ -303,13 +424,27 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -303,13 +424,27 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
con.commit(); con.commit();
//errorString = genericUtility.getErrorString("", "PROCSUCC", userId); //errorString = genericUtility.getErrorString("", "PROCSUCC", userId);
errorString = itmdbAccessEJB.getErrorString("", "PROCSUCC", userId, "", con); errorString = itmdbAccessEJB.getErrorString("", "PROCSUCC", userId, "", con);
hrLogWriter.gbfErrWrite("", "", type, errorString, "I", logConn);//Added by Poonam B[18/10/2019]
} }
else else
{ {
con.rollback(); con.rollback();
//errorString = genericUtility.getErrorString("", "VPF16DSG01", userId); //errorString = genericUtility.getErrorString("", "VPF16DSG01", userId);
errorString = itmdbAccessEJB.getErrorString("", "VPF16DSG01", userId, "", con); errorString = itmdbAccessEJB.getErrorString("", "VPF16DSG01", userId, "", con);
hrLogWriter.gbfErrWrite("", "", type, errorString, "I", logConn);//Added by Poonam B[18/10/2019]
}
//Added by Poonam B[18/10/2019][START]
if("AR".equalsIgnoreCase(type))
{
lsLogStr = " - Arrears Deletion Process Completed";
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn);
}
else
{
lsLogStr = " - Payroll Deletion Process Completed";
hrLogWriter.gbfErrWrite("", "", type, lsLogStr, "I", logConn);
} }
//Added by Poonam B[18/10/2019][END]
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -458,7 +593,7 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -458,7 +593,7 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
pstmt = null; pstmt = null;
} }
}//End Of Try Block }//End Of Try Block
catch (SQLException se) catch (SQLException se)
{ {
...@@ -493,5 +628,33 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo ...@@ -493,5 +628,33 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
return errCode; return errCode;
} }
//Added By Poonam B[26-SEP-2019][END] //Added By Poonam B[26-SEP-2019][END]
//Added By Poonam B[18/10/2019][START]
private String getObjNameFromDom(Document dom, String attribute) throws RemoteException, ITMException
{
System.out.println("Calling getObjNameFromDom(Document dom, String attribute) of AttdSinglePrc");
String objName = "";
try
{
NodeList detailList = null;
Node currDetail = null, reqDetail = null;
int detailListLength = 0;
detailList = dom.getElementsByTagName("Detail1");
detailListLength = detailList.getLength();
for (int ctr = 0; ctr < detailListLength; ctr++)
{
currDetail = detailList.item(ctr);
objName = currDetail.getAttributes().getNamedItem(attribute).getNodeValue();
}
}
catch (Exception e)
{
e.printStackTrace();
}
return objName;
}
//Added By Poonam B[18/10/2019][END]
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment