Skip to content

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

-Changes made in below components closing pstmt and rs properly. 

EmpLeaveCancel.java
LveEncArrCanc.java
HRVoucherReversal.java

-Added updated sql statements
A15ISUN003.sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189490 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6f2dd9fd
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 48 deletions
webitm-adm/ibase/webitm/ejb/adm/HRVoucherReversal.java
View file @ f82f5811
......@@ -20,13 +20,14 @@ import ibase.webitm.utility.TransIDGenerator;
/**** This component is for generate reversal payroll voucher*****/
public class HRVoucherReversal
public class HRVoucherReversal
{
public String actionHandler() throws RemoteException,ITMException
{
return "";
}
public String actionHandler(String tranID, String xtraParams, String forcedFlag,Connection conn) throws RemoteException,ITMException
{
ITMDBAccessEJB itmDBAccessEjb = null;
......@@ -110,16 +111,16 @@ public class HRVoucherReversal
empCode = checkNull(rs.getString("emp_code"));
tranDate = rs.getTimestamp("tran_date");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(tranDate != null)
{
tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat());
......@@ -147,17 +148,17 @@ public class HRVoucherReversal
withHeld = checkNull(rs.getString("WITH_HELD"));
paySite = checkNull(rs.getString("PAY_SITE"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
sql = "SELECT FIN_ENTITY, SITE_CODE__ACCT FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, paySite);
......@@ -324,6 +325,11 @@ public class HRVoucherReversal
pstmt1 = null;
}
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
......@@ -424,16 +430,17 @@ public class HRVoucherReversal
{
try
{
if(rs!=null)
{
rs.close();
rs=null;
}
if(pstmt!=null)
{
pstmt.close();
pstmt=null;
}
if(rs!=null)
{
rs.close();
rs=null;
}
}
catch (SQLException e)
{
......@@ -468,11 +475,12 @@ public class HRVoucherReversal
keyCol = rs.getString("TRAN_ID_COL");
tranSer = rs.getString("REF_SER");
}
// close(pstmt, rs);
pstmt.close();
pstmt=null;
rs.close();
rs=null;
pstmt.close();
pstmt=null;
System.out.println("keyString :"+keyString);
System.out.println("keyCol :"+keyCol);
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLeaveCancel.java
View file @ f82f5811
......@@ -1132,16 +1132,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{
finYearErr = checkNull(rs.getString("err_code"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(finYearErr != null && finYearErr.trim().length() > 0)
{
retString = itmdbAccessEJB.getErrorString("", finYearErr, userId,"",conn);
......@@ -1157,16 +1158,17 @@ public class EmpLeaveCancel extends ActionHandlerEJB implements EmpLeaveCancelL
{
arrearVoucherStatus = checkNull(rs.getString("status"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
//If arrears voucher is exist as confirm status
if("A".equalsIgnoreCase(arrearVoucherStatus))
{
......
webitm-adm/ibase/webitm/ejb/adm/adv/LveEncArrCanc.java
View file @ f82f5811
......@@ -64,6 +64,24 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
e1.printStackTrace();
}
}
finally
{
try
{
if(conn != null)
{
conn.close();
conn = null;
}
}
catch(Exception e )
{
System.out.println("Exception from actionHandler method --["+ e.getMessage() +"]");
e.printStackTrace();
throw new ITMException(e);
}
}
System.out.println("retString--["+retString+"]");
return retString;
}
......@@ -74,7 +92,6 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
ResultSet rs = null;
String tranIdVoucher = "";
Timestamp tranDate = null;
//Timestamp currentDate = null;
String chgUser = "";
String empCode = "";
String tranDateStr = "";
......@@ -130,16 +147,17 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
ConfDateCurrent = rs.getTimestamp("aprv_date");
tranIdLve = checkNull(rs.getString("tran_id__lve"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if("X".equalsIgnoreCase(status))
{
//errString = itmDBAccessEJB.getErrorString("", "VTADMLVE05", chgUser,"",conn);
......@@ -160,16 +178,17 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
return errString;
}
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(tranDate != null)
{
tranDateStr = genericUtility.getValidDateString(tranDate, genericUtility.getDBDateTimeFormat());
......@@ -197,16 +216,17 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
{
accountingYearerror = checkNull(rs.getString("err_code"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(accountingYearerror != null && accountingYearerror.trim().length() > 0)
{
//errString = itmDBAccessEJB.getErrorString("", accountingYearerror, chgUser,"",conn);
......@@ -405,9 +425,9 @@ public class LveEncArrCanc extends ActionHandlerEJB implements LveEncArrCancLoc
}
catch(Exception e)
{
conn.rollback();
System.out.println("Exception in actionHandler [LveEncArrCanc]----["+e.getMessage()+"]");
e.printStackTrace();
conn.rollback();
throw new ITMException(e);
}
finally
......
webitm-adm/module-resource/A15ISUN003/A15ISUN003.sql
View file @ f82f5811
......@@ -36,4 +36,43 @@ Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,AR
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',4,'XML_DATA_ALL','I','xtraParams','S',null,SYSDATE,'BASE','BASE',null);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',5,'FORCED_FLAG','I','forcedFlag','S',null,SYSDATE,'BASE','BASE',null);
--ADDED BY ANJALI R. ON [06/08/2018][END]
\ No newline at end of file
--ADDED BY ANJALI R. ON [06/08/2018][END]
----Added by Anjali R.[modified SQL statements in compliance with framework at SUN] [Start]
SET DEFINE OFF;
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 ('VTADMLVE01','Already cancelled','Voucher is already cancelled.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
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 ('VTADMLVE02','Voucher Cancelled','Arrears voucher cancelled successfully.','P','Y',null,null,null,sysdate,'BASE','BASE',null,null);
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 ('VTADMLVE03','Period Not Defined','Payroll period is not defined in period table.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
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 ('VTADMLVE04','Arrears voucher exist','Please cancel arrears voucher first then only encashment voucher will be cancelled.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
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 ('VTADMLVE05','Arrears already cancelled','Leave Encashment Arrears is already cancelled.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
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 ('VTADMLVE06','Multilple Arrears Voucher','Please Cancel last approved arrears voucher first for same leave encashment then cancel remaining. ','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
INSERT INTO PAYRPARM (PRD_CODE,VAR_NAME,VAR_TYPE,VAR_VALUE,DESCR,VAR_SUBS,CHG_DATE,CHG_USER,CHG_TERM )VALUES ('999999','ALLOW_CANCEL_LVEENC','S','N','FOR ENCASHMENT CANCELLATION','1',SYSDATE,'BASE','BASE');
--Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE) values ('empleave_ench_arr',4,'cancel.gif','Cancellation','pre_cancel','a','X','Cancel','1','2',null,'U');
UPDATE system_events SET service_code ='prcm_empleave_ench_arr' ,comp_type ='EJB' ,COMP_NAME ='LveEncArrCanc' WHERE OBJ_NAME='empleave_ench_arr' AND EVENT_CODE ='pre_cancel';
Insert into SYSTEM_EVENT_SERVICES (SERVICE_CODE,SERVICE_DESCR,SERVICE_URI,SERVICE_PROVIDER,METHOD_NAME,RETURN_VALUE,RETURN_TYPE,RETURN_DESCR,RETURN_XFRM,CHG_DATE,CHG_USER,CHG_TERM)
values ('prcm_empleave_ench_arr','actionHandler','http://localhost:9090/axis/services/ActionHandlerService',null,'actionHandler','String','S',null,null,SYSDATE,'BASE','BASE');
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',1,'COMPONENT_TYPE','I','Component Type','S',null,SYSDATE,'BASE','BASE','EJB');
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',2,'COMPONENT_NAME','I','Component Name','S',null,SYSDATE,'BASE','BASE','LveEncArrCanc');
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',3,'TRAN_ID','I','Tran ID','S',null,SYSDATE,'BASE','BASE',null);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',4,'XML_DATA_ALL','I','xtraParams','S',null,SYSDATE,'BASE','BASE',null);
Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prcm_empleave_ench_arr',5,'FORCED_FLAG','I','forcedFlag','S',null,SYSDATE,'BASE','BASE',null);
----Added by Anjali R.[modified SQL statements in compliance with framework at SUN] [Start]
\ 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