Skip to content

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

Changes made in below component 

EmpLvePrkBalTrfConf.java
-Return string related changes done in confirm method
-Connection commit related changes

EmpLvePrkBalTrfIC.java
-Validation and itemchange related changes done for user level
-Validation added for balance code for detail record

AD89SUN091.sql
-Added messages table entries.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190661 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cdb020c6
Show whitespace changes
Inline Side-by-side
Showing with 219 additions and 38 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpLvePrkBalTrfIC.java
View file @ 7ff7f041
...@@ -117,6 +117,9 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -117,6 +117,9 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
String empSiteFrDescr = ""; String empSiteFrDescr = "";
String userLevel = ""; String userLevel = "";
int count = 0; int count = 0;
String tranDate = "";
String siteCodeFr = "";
int usrLvl = 0;
//Modified by Anjali R. on [14-08-2018][Added to get empSiteFr][End] //Modified by Anjali R. on [14-08-2018][Added to get empSiteFr][End]
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
...@@ -249,11 +252,19 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -249,11 +252,19 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
String tranIdEdit = checkNull( genericUtility.getColumnValue( "tran_id", dom ) ); String tranIdEdit = checkNull( genericUtility.getColumnValue( "tran_id", dom ) );
String status = checkNull( genericUtility.getColumnValue( "status", dom ) ); String status = checkNull( genericUtility.getColumnValue( "status", dom ) );
tranType = checkNull( getColumnValue( "tran_type", dom, "1" ) ) ; tranType = checkNull( getColumnValue( "tran_type", dom, "1" ) ) ;
//Modified by Anjali R. on[11/09/2018][Get values from dom][Start]
tranDate = checkNull(genericUtility.getColumnValue( "tran_date", dom ) );
siteCodeFr = checkNull(genericUtility.getColumnValue("site_code__fr", dom));
//Modified by Anjali R. on[11/09/2018][Get values from dom][End]
valueXmlString.append("<tran_id protect=\"1\"><![CDATA[").append( tranIdEdit ).append("]]></tran_id>\r\n"); valueXmlString.append("<tran_id protect=\"1\"><![CDATA[").append( tranIdEdit ).append("]]></tran_id>\r\n");
valueXmlString.append("<emp_code__fr protect=\"1\"><![CDATA[").append( empCodeFrom ).append("]]></emp_code__fr>\r\n"); valueXmlString.append("<emp_code__fr protect=\"1\"><![CDATA[").append( empCodeFrom ).append("]]></emp_code__fr>\r\n");
valueXmlString.append("<tran_type protect=\"1\"><![CDATA[").append( tranType ).append("]]></tran_type>\r\n"); valueXmlString.append("<tran_type protect=\"1\"><![CDATA[").append( tranType ).append("]]></tran_type>\r\n");
valueXmlString.append( "<tran_date protect=\"1\"><![CDATA[").append( curDate ).append("]]></tran_date>\r\n" ); //Modified by Anjali R. on[11/09/2018][set dom values ][Start]
valueXmlString.append( "<site_code__fr protect=\"1\"><![CDATA[").append( loginSiteCode ).append("]]></site_code__fr>\r\n" ); /*valueXmlString.append( "<tran_date protect=\"1\"><![CDATA[").append( curDate ).append("]]></tran_date>\r\n" );
valueXmlString.append( "<site_code__fr protect=\"1\"><![CDATA[").append( loginSiteCode ).append("]]></site_code__fr>\r\n" );*/
valueXmlString.append( "<tran_date protect=\"1\"><![CDATA[").append( tranDate ).append("]]></tran_date>\r\n" );
valueXmlString.append( "<site_code__fr protect=\"1\"><![CDATA[").append( siteCodeFr ).append("]]></site_code__fr>\r\n" );
//Modified by Anjali R. on[11/09/2018][set dom values][end]
valueXmlString.append( "<status protect=\"1\"><![CDATA[").append( status ).append("]]></status>\r\n" ); valueXmlString.append( "<status protect=\"1\"><![CDATA[").append( status ).append("]]></status>\r\n" );
} }
else if ( "emp_code__fr".equalsIgnoreCase( currentColumn ) ) else if ( "emp_code__fr".equalsIgnoreCase( currentColumn ) )
...@@ -373,7 +384,20 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -373,7 +384,20 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
} }
System.out.println("userLevel:::::::["+userLevel+"]"); System.out.println("userLevel:::::::["+userLevel+"]");
if( Integer.parseInt( userLevel ) > 1 ) //Modified by Anjali R. on [11/09/2018][Start]
try
{
usrLvl = Integer.parseInt( userLevel );
}
catch(Exception e)
{
System.out.println("usrLvl----["+usrLvl+"]");
usrLvl = 1;
}
//if( Integer.parseInt( userLevel ) > 1 )
if(usrLvl > 1 )
//Modified by Anjali R. on [11/09/2018][End]
{ {
sql = "select count(SITE_CODE) as cnt from user_site where USER_ID = ? and site_code = ?"; sql = "select count(SITE_CODE) as cnt from user_site where USER_ID = ? and site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -394,7 +418,7 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -394,7 +418,7 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} //Modified by Anjali R. on[11/09/2018][To set values user level wise][Start]
if(count <= 0) if(count <= 0)
{ {
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></emp_name__fr>\r\n"); valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></emp_name__fr>\r\n");
...@@ -402,6 +426,22 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -402,6 +426,22 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_descr__fr>\r\n"); valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_descr__fr>\r\n");
} }
else else
{
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( empNameFrom ).append("]]></emp_name__fr>\r\n");
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append( empSiteFr ).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( empSiteFrDescr ).append("]]></site_descr__fr>\r\n");
}
//Modified by Anjali R. on[11/09/2018][To set values user level wise][end]
}
//Commented by Anjali R. on[11/09/2018][Start]
/*if(count <= 0)
{
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></emp_name__fr>\r\n");
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_descr__fr protect=\"1\"><![CDATA[").append( "" ).append("]]></site_descr__fr>\r\n");
}*/
//Commented by Anjali R. on[11/09/2018][End]
else
{ {
//Modified by Anjali R. on [07/09/2018][To access user level wise][End] //Modified by Anjali R. on [07/09/2018][To access user level wise][End]
valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( empNameFrom ).append("]]></emp_name__fr>\r\n"); valueXmlString.append("<emp_name__fr protect=\"1\"><![CDATA[").append( empNameFrom ).append("]]></emp_name__fr>\r\n");
...@@ -655,6 +695,7 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -655,6 +695,7 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
int ctr = 0; int ctr = 0;
int count = 0; int count = 0;
String userId = "" ; String userId = "" ;
int usrLvl = 0;//Added by Anjali R. on [11/09/2018]
String objName = ""; String objName = "";
String keyFlag = ""; String keyFlag = "";
...@@ -854,9 +895,30 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -854,9 +895,30 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
{ {
userLevel = checkNull( rs.getString( "USR_LEV" ) ); userLevel = checkNull( rs.getString( "USR_LEV" ) );
} }
//Modified by Anjali R. on [11/09/2018][Start]
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
System.out.println("userLevel:::::::["+userLevel+"]"); System.out.println("userLevel:::::::["+userLevel+"]");
try
if( Integer.parseInt( userLevel ) > 1 ) {
usrLvl = Integer.parseInt( userLevel ) ;
}
catch(Exception e)
{
System.out.println("exception while parsing---["+e.getMessage()+"]");
usrLvl = 1;
}
//if( Integer.parseInt( userLevel ) > 1 )
if( usrLvl > 1 )
//Modified by Anjali R. on [11/09/2018][End]
{ {
siteCodeFrom = checkNull( genericUtility.getColumnValue( "site_code__fr", dom, objContext ) ); siteCodeFrom = checkNull( genericUtility.getColumnValue( "site_code__fr", dom, objContext ) );
//Modified by Anjali R. on[07/09/2018][Start] //Modified by Anjali R. on[07/09/2018][Start]
...@@ -1161,6 +1223,33 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC ...@@ -1161,6 +1223,33 @@ public class EmpLvePrkBalTrfIC extends ValidatorEJB implements EmpLvePrkBalTrfIC
} }
} }
break; break;
//Modified by Anjali R. on [11/09/2018][To validate balance code][Start]
case 2 :
parentNodeList = dom1.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0);
parentNodeList = dom.getElementsByTagName("Detail2");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
for(ctr = 0; ctr < childNodeListLength; ctr ++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if(childNodeName.equalsIgnoreCase("balance_code"))
{
String balanceCode = checkNull( genericUtility.getColumnValue("balance_code",dom )) ;
System.out.println("balanceCode---["+balanceCode+"]");
if(balanceCode == null || balanceCode.trim().length() == 0)
{
System.out.println("balanceCode null--["+balanceCode+"]");
retString = itmDBAccess.getErrorString( "", "VTELPTRF26", userId, "", conn );
return retString;
}
}
}
break;
//Modified by Anjali R. on [11/09/2018][To validate balance code][End]
} }
/*int errListSize = errList.size(); /*int errListSize = errList.size();
if ( errList != null && errListSize > 0 ) if ( errList != null && errListSize > 0 )
......
webitm-adm/ibase/webitm/ejb/adm/adv/EmpLvePrkBalTrfConf.java
View file @ 7ff7f041
...@@ -45,13 +45,26 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -45,13 +45,26 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
Connection conn = null; Connection conn = null;
boolean errorFound = false; boolean errorFound = false;
String retStr = ""; String retStr = "";
ITMDBAccessEJB itmDBAccess = null;//added by Anjali R. on [11/09/2018]
try { try {
itmDBAccess = new ITMDBAccessEJB();//added by Anjali R. on [11/09/2018]
conn = getConnection(); conn = getConnection();
System.out.println("tranId:::::[" + tranId + "] xtraParams::::: [" + xtraParams + "] forcedFlag::::: [" System.out.println("tranId:::::[" + tranId + "] xtraParams::::: [" + xtraParams + "] forcedFlag::::: ["
+ forcedFlag + "]"); + forcedFlag + "]");
retStr = confirm(tranId, xtraParams, forcedFlag, conn); retStr = confirm(tranId, xtraParams, forcedFlag, conn);
System.out.println("Umakanta::retStr[" + retStr + "]"); System.out.println("Umakanta::retStr[" + retStr + "]");
//added by Anjali R. on [11/09/2018][If retrun string is blank then system will show success message][Start]
if(retStr != null && retStr.trim().length() > 0)
{
errorFound = true;
}
else
{
retStr = itmDBAccess.getErrorString("", "VTSUCC1", "", "", conn);
errorFound = false;
}
//added by Anjali R. on [11/09/2018][If retrun string is blank then system will show success message][End]
} catch (Exception e) { } catch (Exception e) {
errorFound = true; errorFound = true;
System.out.println("in confirm [" + e.getMessage() + "]"); System.out.println("in confirm [" + e.getMessage() + "]");
...@@ -95,7 +108,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -95,7 +108,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
@SuppressWarnings({ "unused", "resource" }) @SuppressWarnings({ "unused", "resource" })
public String confirm(String tranId, String xtraParams, String forcedFlag, Connection conn) throws RemoteException, ITMException { public String confirm(String tranId, String xtraParams, String forcedFlag, Connection conn) throws RemoteException, ITMException {
String retString = ""; String retString = "";
String successString = ""; //String successString = "";//Commented by Anjali R. on [11/09/2018][This variable never used]
ResultSet rs = null; ResultSet rs = null;
ResultSet rs1 = null; ResultSet rs1 = null;
PreparedStatement pStmt = null, pStmt1 = null, pStmt2 = null, pStmt3 = null, pStmt4 = null, pStmt5 = null, pStmt6 = null,pStmt7 = null; PreparedStatement pStmt = null, pStmt1 = null, pStmt2 = null, pStmt3 = null, pStmt4 = null, pStmt5 = null, pStmt6 = null,pStmt7 = null;
...@@ -223,14 +236,20 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -223,14 +236,20 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
successFlag = false; successFlag = false;
return retString; return retString;
} }
//Modified by Anjali R. on [11/09/2018][Tran type not set in where clause][Start]
//Modified by Anjali R. on [01/09/2018][To validate unconfirmed records for same employee][Start] //Modified by Anjali R. on [01/09/2018][To validate unconfirmed records for same employee][Start]
System.out.println("tranType--["+tranType+"]"); //sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? AND TRAN_TYPE = ?"
sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? AND TRAN_TYPE = ?" //+ " AND STATUS NOT IN('C','X') AND TRAN_ID <> ? ";
sql = " SELECT count(*) as cnt FROM EMP_LVEPRKBAL_TRFHDR WHERE EMP_CODE__FR = ? "
+ " AND STATUS NOT IN('C','X') AND TRAN_ID <> ? "; + " AND STATUS NOT IN('C','X') AND TRAN_ID <> ? ";
//Modified by Anjali R. on [11/09/2018][Tran type not set in where clause][End]
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, empCodeFr); pStmt.setString(1, empCodeFr);
pStmt.setString(2, tranType); //Modified by Anjali R. on [11/09/2018][Tran type not set in where clause][Start]
pStmt.setString(3, tranId); /*pStmt.setString(2, tranType);
pStmt.setString(3, tranId);*/
pStmt.setString(2, tranId);
//Modified by Anjali R. on [11/09/2018][Tran type not set in where clause][End]
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -405,12 +424,13 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -405,12 +424,13 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
toDate = rs.getTimestamp("TO_DATE"); toDate = rs.getTimestamp("TO_DATE");
lineNo = rs.getInt("LINE_NO");//Modified by Anjali R. on [07/09/2018][To get line no] lineNo = rs.getInt("LINE_NO");//Modified by Anjali R. on [07/09/2018][To get line no]
double balDays = 0.0D; //double balDays = 0.0D;//Commented by Anjali R. on [11/09/2018][Variable never used anywhere]
xmlStringForID = new StringBuffer(); xmlStringForID = new StringBuffer();
xmlStringForID.append("<Root><Detail1><appl_date>" + curDateTm + "</appl_date><lve_code>" + balCode xmlStringForID.append("<Root><Detail1><appl_date>" + curDateTm + "</appl_date><lve_code>" + balCode
+ "</lve_code>" + "<lve_date_fr>" + releiveDateStr + "</lve_date_fr>" + "<work_site>" + "</lve_code>" + "<lve_date_fr>" + releiveDateStr + "</lve_date_fr>" + "<work_site>"
+ workSite + "</work_site>" + "</Detail1></Root>"); + workSite + "</work_site>" + "</Detail1></Root>");
System.out.println("xmlStringForID::::[" + xmlStringForID + "]"); System.out.println("xmlStringForID::::[" + xmlStringForID + "]");
TransIDGenerator tg = new TransIDGenerator(xmlStringForID.toString(), "SYSTEM", TransIDGenerator tg = new TransIDGenerator(xmlStringForID.toString(), "SYSTEM",
CommonConstants.DB_NAME); CommonConstants.DB_NAME);
...@@ -469,12 +489,14 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -469,12 +489,14 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
String confirmStatus = empLeaveConf.confirm(tranIdGen, xtraParams, "Y",1, conn); String confirmStatus = empLeaveConf.confirm(tranIdGen, xtraParams, "Y",1, conn);
System.out.println("empLeaveConf.confirm::confirmStatus[" + confirmStatus + "]"); System.out.println("empLeaveConf.confirm::confirmStatus[" + confirmStatus + "]");
if(!confirmStatus.contains("VTSUCC1")) //Modified by Anjali R on [11/09/2018][For leave status ,does not check return string of confirmation component.][Start]
/*if(!confirmStatus.contains("VTSUCC1"))
{ {
successFlag = false; successFlag = false;
retString = confirmStatus; retString = confirmStatus;
break; break;
} }*/
//Modified by Anjali R on [11/09/2018][For leave status ,does not check return string of confirmation component.][End]
pStmt4.setString(1, tranIdGen); pStmt4.setString(1, tranIdGen);
rs1 = pStmt4.executeQuery(); rs1 = pStmt4.executeQuery();
if (rs1.next()) { if (rs1.next()) {
...@@ -488,7 +510,10 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -488,7 +510,10 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
System.out.println("empLeave.table::statusEmpLeave[" + statusEmpLeave + "]"); System.out.println("empLeave.table::statusEmpLeave[" + statusEmpLeave + "]");
if (statusEmpLeave.equalsIgnoreCase("A")) { if (statusEmpLeave.equalsIgnoreCase("A")) {
successFlag = true; successFlag = true;
successString = confirmStatus; //Modified by Anjali R. on[11/09/2018][Success string not check or return anywhere in case of success then retrun string should be blank][Start]
//successString = confirmStatus;
retString = "";
//Modified by Anjali R. on[11/09/2018][Success string not check or return anywhere in case of success then retrun string should be blank][End]
} else { } else {
retString = confirmStatus; retString = confirmStatus;
successFlag = false; successFlag = false;
...@@ -497,6 +522,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -497,6 +522,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
System.out.println("::After EmpLeave status successFlag[" + successFlag + "]"); System.out.println("::After EmpLeave status successFlag[" + successFlag + "]");
} else { } else {
successFlag = false; successFlag = false;
//Modified by Anjali R. on[11/09/2018][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][End]
break; break;
} }
} }
...@@ -592,7 +620,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -592,7 +620,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
} else if ("PRK".equalsIgnoreCase(tranType)) { } else if ("PRK".equalsIgnoreCase(tranType)) {
if (empCodeTo.length() <= 0) { if (empCodeTo.length() <= 0) {
retString = itmDBAccess.getErrorString("", "VTELPTRF19", userId, "", conn); retString = itmDBAccess.getErrorString("", "VTELPTRF19", userId, "", conn);
successFlag = false; successFlag = false;//Added by Anjali R. on [11/09/2018]
return retString; return retString;
} }
...@@ -636,6 +664,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -636,6 +664,7 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
//Modfied by Anjali R. on [06/09/2018][Added sql statement to update lapsed perk record tran_id][start] //Modfied by Anjali R. on [06/09/2018][Added sql statement to update lapsed perk record tran_id][start]
updStr = "UPDATE EMP_LVEPRKBAL_TRFDET set TRAN_ID__REF = ? where TRAN_ID = ? and LINE_NO = ?"; updStr = "UPDATE EMP_LVEPRKBAL_TRFDET set TRAN_ID__REF = ? where TRAN_ID = ? and LINE_NO = ?";
pstmtUpd = conn.prepareStatement(updStr); pstmtUpd = conn.prepareStatement(updStr);
//Modfied by Anjali R. on [06/09/2018][Added sql statement to update lapsed perk record tran_id][End]
//sql = " SELECT ACCT_PRD, BALANCE_CODE , ENCASHABLE, LVE_UNIT, FROM_DATE, TO_DATE, EXP_DATE, BALANCE FROM EMP_LVEPRKBAL_TRFDET WHERE TRAN_ID = ? GROUP BY ACCT_PRD, BALANCE_CODE, ENCASHABLE, LVE_UNIT, FROM_DATE, to_date, exp_date, BALANCE "; //sql = " SELECT ACCT_PRD, BALANCE_CODE , ENCASHABLE, LVE_UNIT, FROM_DATE, TO_DATE, EXP_DATE, BALANCE FROM EMP_LVEPRKBAL_TRFDET WHERE TRAN_ID = ? GROUP BY ACCT_PRD, BALANCE_CODE, ENCASHABLE, LVE_UNIT, FROM_DATE, to_date, exp_date, BALANCE ";
sql = "SELECT ACCT_PRD, BALANCE_CODE , ENCASHABLE, LVE_UNIT, FROM_DATE, TO_DATE, EXP_DATE, BALANCE ,LINE_NO FROM EMP_LVEPRKBAL_TRFDET WHERE TRAN_ID = ? GROUP BY ACCT_PRD, BALANCE_CODE, ENCASHABLE, LVE_UNIT, FROM_DATE, to_date, exp_date, BALANCE ,LINE_NO ORDER BY LINE_NO"; sql = "SELECT ACCT_PRD, BALANCE_CODE , ENCASHABLE, LVE_UNIT, FROM_DATE, TO_DATE, EXP_DATE, BALANCE ,LINE_NO FROM EMP_LVEPRKBAL_TRFDET WHERE TRAN_ID = ? GROUP BY ACCT_PRD, BALANCE_CODE, ENCASHABLE, LVE_UNIT, FROM_DATE, to_date, exp_date, BALANCE ,LINE_NO ORDER BY LINE_NO";
...@@ -726,6 +755,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -726,6 +755,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
else else
{ {
successFlag = false; successFlag = false;
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
break; break;
} }
...@@ -750,6 +782,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -750,6 +782,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
} else } else
{ {
successFlag = false; successFlag = false;
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
break; break;
} }
...@@ -781,9 +816,19 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -781,9 +816,19 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
else else
{ {
successFlag = false; successFlag = false;
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
break; break;
} }
} }
else
{
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
return retString;
}
// Ended by Varsha V on 16-07-18 for updating AMOUNT for emp_code_fr // Ended by Varsha V on 16-07-18 for updating AMOUNT for emp_code_fr
System.out.println("*************admEnvReturn:::::[" + admEnvReturn + "]"); System.out.println("*************admEnvReturn:::::[" + admEnvReturn + "]");
if ((admEnvReturn == null) || (admEnvReturn.trim().length() == 0) if ((admEnvReturn == null) || (admEnvReturn.trim().length() == 0)
...@@ -822,6 +867,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -822,6 +867,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
else else
{ {
successFlag = false; successFlag = false;
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
break; break;
} }
} }
...@@ -854,6 +902,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -854,6 +902,9 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
else else
{ {
successFlag = false; successFlag = false;
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
break; break;
} }
} }
...@@ -967,16 +1018,26 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -967,16 +1018,26 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
pStmt.setString(4, tranId); pStmt.setString(4, tranId);
updCnt = pStmt.executeUpdate(); updCnt = pStmt.executeUpdate();
if (updCnt > 0) { if (updCnt > 0) {
successString = itmDBAccess.getErrorString("", "VTSUCC1", userId, "", conn); //Modified by Anjali R. on[11/09/2018][In case of success system should return blank return string][Start]
//successString = itmDBAccess.getErrorString("", "VTSUCC1", userId, "", conn);
successFlag = true; successFlag = true;
System.out.println("Umakanta::retString::Confirm[" + successString + "]"); //System.out.println("Umakanta::retString::Confirm[" + successString + "]");
return successString; //return successString;
retString = "";
return retString;
//Modified by Anjali R. on[11/09/2018][In case of success system should return blank return string][End]
} else { } else {
retString = itmDBAccess.getErrorString("", "VTELPTRF23", userId, "", conn); retString = itmDBAccess.getErrorString("", "VTELPTRF23", userId, "", conn);
successFlag = false; successFlag = false;
return retString; return retString;
} }
} }
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][Start]
else
{
retString = itmDBAccess.getErrorString("", "DS000", userId, "", conn);
}
//Modified by Anjali R. on[11/09/2018][[Need to show error in case of rows not inserted][End]
} catch (SQLException se) { } catch (SQLException se) {
se.printStackTrace(); se.printStackTrace();
successFlag = false; successFlag = false;
...@@ -1001,14 +1062,24 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa ...@@ -1001,14 +1062,24 @@ public class EmpLvePrkBalTrfConf extends ActionHandlerEJB implements EmpLvePrkBa
System.out.println("errString after getErrorXmlString: " + retString); System.out.println("errString after getErrorXmlString: " + retString);
String str1 = retString; String str1 = retString;
return str1; return str1;
} finally { }
try { finally
if (conn != null) { {
if (successFlag) { try
{
if (conn != null)
{
//Modified by Anjali R. on [11/09/2018][Connection commit will not perform in this method][Start]
/*if (successFlag) {
conn.commit(); conn.commit();
} else { }
else {
conn.rollback();
}*/
if (!successFlag) {
conn.rollback(); conn.rollback();
} }
//Modified by Anjali R. on [11/09/2018][Connection commit will not perform in this method][End]
if (rs1 != null) { if (rs1 != null) {
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
......
webitm-adm/module-resource/AD89SUN091/AD89SUN091.sql
View file @ 7ff7f041
...@@ -2385,3 +2385,24 @@ values ('VTUNCONF01','Already record exist','For this employee unconfirmed recor ...@@ -2385,3 +2385,24 @@ values ('VTUNCONF01','Already record exist','For this employee unconfirmed recor
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) 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 ('VTELPTRF25','Insufficiant Balance','Employee does not have sufficient balance.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null); values ('VTELPTRF25','Insufficiant Balance','Employee does not have sufficient balance.','E','Y',null,null,null,sysdate,'SUN','SUN',null,null);
--Added by Anjali R. on[16-08-2018][End] --Added by Anjali R. on[16-08-2018][End]
--Added by Anjali R. on[11-09-2018][Start]
SET DEFINE OFF;
update transetup set site_acc_col = null where tran_window = 'w_emp_lveprkbal_trf';
alter table emp_lveprkbal_trfdet add TRAN_ID__REF VARCHAR2(10);
alter table emp_lveprkbal_trfhdr modify status_date date 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 ('DS000','Database Exception','Database Error','E','Y',0,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 ('VTELPTRF26','BALANCE CODE BLANK','Please specify balance code,Balance code should not be blank.','E',NULL,NULL,NULL,NULL,SYSDATE,'BASE','BASE',NULL,NULL);
COMMIT;
--Added by Anjali R. on[11-09-2018][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