Skip to content

B
business-java
Commit 8c71892e authored by anarvariya's avatar anarvariya
Browse files
Options

Changes done at sun are merged by piyush on 18/07/2014 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95651 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dbfd8456
Show whitespace changes
Inline Side-by-side
Showing with 716 additions and 513 deletions
webitm-adm/ibase/webitm/ejb/adm/PfNumberprs.java
View file @ 8c71892e
......@@ -142,12 +142,38 @@ public class PfNumberprs extends ValidatorEJB implements PfNumberprsLocal,PfNum
}
valueXmlString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<editFlag>" );
valueXmlString.append( editFlag ).append( "</editFlag>\r\n</Header>\r\n" );
columnValue = genericUtility.getColumnValue(currentColumn, currDom);
valueXmlString.append( "<Detail1>\r\n" );
if(currentColumn.trim().equalsIgnoreCase("itm_default") || currentColumn.trim().equalsIgnoreCase("itm_defaultedit") )
{
System.out.println(" tran date value"+statusDate);
valueXmlString.append( "<tran_date><![CDATA[" ).append( statusDate ).append( "]]></tran_date>\r\n" );
}
//Added by Hemlata[16/07/2014][For setting site code based on emp code].Start
else if (currentColumn.trim().equals("emp_code"))
{
if(columnValue !=null && columnValue.trim().length() >0)
{
sql="SELECT PAY_SITE FROM EMPLOYEE WHERE EMP_CODE= ? ";
System.out.println("*SQL:****************"+sql);
pstmt = connObject.prepareStatement( sql );
pstmt.setString(1,columnValue);
rs = pstmt.executeQuery();
String paySite ="";
if( rs.next())
{
paySite =checkNull(rs.getString("PAY_SITE"));
}
valueXmlString.append( "<emp_code><![CDATA[" ).append( columnValue ).append( "]]></emp_code>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( paySite ).append( "]]></site_code>\r\n" );
}
else
{
valueXmlString.append("<site_code><![CDATA[]]></site_code>\r\n");
}
}
// Added by Hemlata[16/07/2014][For setting site code based on emp code].End
valueXmlString.append( "</Detail1>\r\n" );
}//End of TRY itemChanged doc
catch(Exception e)
......@@ -184,6 +210,20 @@ public class PfNumberprs extends ValidatorEJB implements PfNumberprsLocal,PfNum
return valueXmlString.toString();
}//End of Item changed
// To check Columnvalue is null or not
private String checkNull( String input )
{
if (input == null)
{
input = "";
}
else
{
input = input.trim();
}
return input;
}
public String preSave()throws RemoteException,ITMException
{
return "";
......
webitm-adm/ibase/webitm/ejb/adm/SiteStanPayTbl.java
View file @ 8c71892e
......@@ -286,6 +286,7 @@ public class SiteStanPayTbl extends ValidatorEJB implements SiteStanPayTblLocal
errString = getErrorString("stan_code","VMSTANINVD",userId);
break;
}
sql = "SELECT COUNT(*) AS COUNT FROM STATION WHERE STAN_CODE = ? AND STATE_CODE = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,stanCode);
......@@ -313,8 +314,48 @@ public class SiteStanPayTbl extends ValidatorEJB implements SiteStanPayTblLocal
break;
}
}
//Added by Hemlata[17/07/2014][to validate duplicate entry for SITE_STAN_PAYTBL][start]
//Added by Radheshyam[01/03/2014][to validate duplicate entry for SITE_STAN_PAYTBL][start]
siteCode = getColumnValue("site_code",dom1,objContext);
stateCode = getColumnValue("state_code",dom1,objContext);
stanCode = getColumnValue("stan_code",dom1,objContext);
System.out.println("value of count in siteCode:::: "+siteCode);
System.out.println("value of count in stateCode:::: "+stateCode);
System.out.println("value of count in stan_code:::: "+stanCode);
sql = "SELECT COUNT(*) AS COUNT FROM SITE_STAN_PAYTBL WHERE site_code = ? AND STATE_CODE = ? AND STAN_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,stateCode);
pstmt.setString(3,stanCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
System.out.println("value of count :::: "+count);
if ( rs != null )
{
rs.close();
rs = null;
}
if ( pstmt != null )
{
pstmt.close();
pstmt = null;
}
if(count > 0)
{
System.out.println("Duplicate Entries");
//errString = getErrorString("stan_code","VMSTANDUPL",userId);
errString = getErrorString("stan_code","VMSTNPTBL1",userId);
break;
}
//Added by Radheshyam[01/03/2014][to validate duplicate entry for SITE_STAN_PAYTBL][End]
// Added by Hemlata[17/07/2014][to validate duplicate entry for SITE_STAN_PAYTBL][End]
}
} //END IF (stan_code)
//END IF (stan_code)
else if (childNodeName.equalsIgnoreCase("pay_table"))
{
payTable = getColumnValue("pay_table",dom1,objContext);
......
webitm-adm/ibase/webitm/ejb/adm/adv/FullFinalAct.java
View file @ 8c71892e
......@@ -508,6 +508,23 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalActEJB] wf_calc_lnint() :cctrSalEmp ===============>"+cctrSalEmp);
log.write("[FullFinalActEJB] wf_calc_lnint() :paySite ===============>"+paySite);
//Modified by Radheshyam[07/03/2014][ Request ID : AD3GSUN001 ][sql query was not correct at SUM( C.INTEREST_AMT ) should be calculated in column INTEREST_AMT]
/*sqlStr = "SELECT A.LOAN_NO," +
" A.LOAN_AMT, " +
" A.BALANCE_AMT, " +
" A.SCHEME_NO, " +
" B.AD_CODE__DED, " +
" B.AD_CODE__INT, " +
" SUM( C.INTEREST_AMT )" +
" FROM LOANS A, LOAN_SCHEME B, LOANS_INTEREST C " +
" WHERE ( A.SCHEME_NO = B.SCHEME_NO ) AND " +
" ( A.LOAN_NO = C.LOAN_NO ) AND " +
" ( ( A.EMP_CODE = '"+empCode+"' ) AND " +
" ( B.SCHEME_NO = A.SCHEME_NO ) AND " +
" ( CASE WHEN C.CONFIRMED IS NULL THEN 'N' ELSE C.CONFIRMED END = 'Y' ) AND " +
" ( CASE WHEN A.STATUS IS NULL THEN 'U' ELSE A.STATUS END = 'A' ) ) " +
" GROUP BY A.LOAN_NO, A.LOAN_AMT, A.BALANCE_AMT, A.SCHEME_NO, B.AD_CODE__DED, B.AD_CODE__INT " +
" ORDER BY A.LOAN_NO ASC, A.LOAN_AMT ASC, A.BALANCE_AMT ASC, A.SCHEME_NO ASC, B.AD_CODE__DED ASC, B.AD_CODE__INT ASC ";*/
sqlStr = "SELECT A.LOAN_NO," +
" A.LOAN_AMT, " +
......@@ -515,7 +532,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
" A.SCHEME_NO, " +
" B.AD_CODE__DED, " +
" B.AD_CODE__INT, " +
" SUM( C.INTEREST_AMT )" +
" SUM( C.INTEREST_AMT ) AS INTEREST_AMT" +
" FROM LOANS A, LOAN_SCHEME B, LOANS_INTEREST C " +
" WHERE ( A.SCHEME_NO = B.SCHEME_NO ) AND " +
" ( A.LOAN_NO = C.LOAN_NO ) AND " +
......@@ -594,14 +611,25 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
//--- Collect total rercovery done thru payroll (including interest) against each loans
System.out.println("line no : ---------->>> 600");
sqlStr = "SELECT CASE WHEN SUM(CASE WHEN PAYROLLDET.AMOUNT IS NULL THEN 0 ELSE PAYROLLDET.AMOUNT END) IS NULL THEN 0 " +
//Modified by Radheshyam[07/03/2014][Request ID : AD3GSUN001][sql query was not correct at AYROLLDET.AD_CODE and AYROLLDET.REF_NO table name should be PAYROLLDET]
/*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 = '"+empCode+"'" +
" AND PAYROLLDET.PRD_CODE = PERIOD.CODE" +
" AND PERIOD.CODE > '0'" +
" AND AYROLLDET.AD_CODE IN( '"+adCodeDed+"' , '"+adCodeInt+"')" +
" AND AYROLLDET.REF_NO = '"+loanNo+"'";
" AND AYROLLDET.REF_NO = '"+loanNo+"'";*/
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 = '"+empCode+"'" +
" AND PAYROLLDET.PRD_CODE = PERIOD.CODE" +
" AND PERIOD.CODE > '0'" +
" AND PAYROLLDET.AD_CODE IN( '"+adCodeDed+"' , '"+adCodeInt+"')" +
" AND PAYROLLDET.REF_NO = '"+loanNo+"'";
System.out.println("Sql String : "+sqlStr);
log.write("Sql String : "+sqlStr);
......@@ -669,6 +697,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt1.close();
stmt1 = null;
//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);
System.out.println("[FullFinalActEJB] wf_calc_lnint() :acctCodeSal ===============>"+acctCodeSal);
System.out.println("[FullFinalActEJB] wf_calc_lnint() :cctrSalAllwdedn ===============>"+cctrSalAllwdedn);
System.out.println("[FullFinalActEJB] wf_calc_lnint() :descr ===============>"+descr);
......@@ -980,6 +1011,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
}
remarks = ""+ shDescr + "for " + startDt + " to " + endDt ;
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
//remarks = getRemarksByFunction(empCode, relieveDt, "ALDBAL", refType, refNo, adCode, startDate.toString(), endDate.toString(), balanceAmt, 0, acctCodeSal, cctrCode, conn, remarks);//Modified by Radheshyam [04/03/2014]
remarks = getRemarksByFunction(empCode,genericUtility.getValidDateTimeString(relieveDt,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()), "ALDBAL", refType, refNo, adCode, startDate.toString(), endDate.toString(), balanceAmt, 0, acctCodeSal, cctrCode, conn, remarks);
System.out.println("[FullFinalActEJB] wf_calc_allwdedn() :remarks ===============>"+remarks);
System.out.println("[FullFinalActEJB] payable========>"+payable);
log.write("[FullFinalActEJB] wf_calc_allwdedn() :remarks ===============>"+remarks);
......@@ -1088,6 +1123,7 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
String adCode = "", cctrSalEmp = "", paySite = "", refType = "", refNo ="", cctrCode = "";
String finEntity = "", currCodeTo = "", trDate = "", acctCode = "", currFluc = "", descr = "";
String sqlStr = "", sqlStr1 = "", retString = "", errorCode = "", errString = "";
String relieveDt = "";//Added by Radheshyam[15/01/2014][Request ID : AD3GSUN001]
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;
......@@ -1114,6 +1150,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
empCode = genericUtility.getColumnValue("emp_code", dom1,"1");//UPDATED BY NISAR ON 13/12/07
tranID = genericUtility.getColumnValue("tran_id", dom1,"1");
trDate = genericUtility.getColumnValue("tran_date", dom1,"1");
//Added by Radheshyam[15/01/2014][Request ID : AD3GSUN001][to get value of relieve Date from Dom]
relieveDt = genericUtility.getColumnValue("relieve_date", dom1,"1");
java.util.Date tranDate = new java.util.Date();
tranDate = new SimpleDateFormat(genericUtility.getApplDateFormat()).parse(trDate);
sqlStr = "SELECT CCTR_CODE__SAL, PAY_SITE, CADRE, GRADE FROM EMPLOYEE WHERE EMP_CODE = '"+empCode+"'";
......@@ -1267,6 +1306,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
stmt1.close();
stmt1 = null;
}
//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, genericUtility.getValidDateTimeString(relieveDt,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()), "MPAY", refSer, refNo, "", null, null, balanceAmt, 0, acctCode, cctrCode, conn, remarks);
if(dailyExchrate > exchRate)
{
diffExchrate = dailyExchrate - exchRate;
......@@ -1328,6 +1370,9 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
balanceAmt = netAmt;
remarks = "Towards Currency Fluctuation";
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
//remarks = getRemarksByFunction(empCode, relieveDt, "MPAYCF", refSer, refNo, "", null, null, balanceAmt, 0, acctCode, cctrCode, conn, remarks);//Modified by Radheshyam [04/03/2014]
remarks = getRemarksByFunction(empCode, genericUtility.getValidDateTimeString(relieveDt,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()), "MPAYCF", refSer, refNo, "", null, null, balanceAmt, 0, acctCode, cctrCode, conn, remarks);
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :netAmt ===============>"+netAmt);
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :balanceAmt ===============>"+balanceAmt);
System.out.println("[FullFinalActEJB] wf_calc_miscpay() :remarks ===============>"+remarks);
......@@ -1879,6 +1924,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
cctrCode = cctrCodeSal;
}
remarks = "Towards Notice Pay Recovery of " + diffDays + "days";
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
//remarks = getRemarksByFunction(empCode, relieveDate.toString(), "NRECO", "", "", noticeAd, null, null, amount1, diffDays, acctCode, cctrCode, conn, remarks);//Modified by Radheshyam[04/03/2014]
remarks = getRemarksByFunction(empCode, relieveDate.toString(), "NPRECO", "", "", noticeAd, null, null, amount1, diffDays, acctCode, cctrCode, conn, remarks);
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+" ]");
noticeAd = "";
......@@ -2032,6 +2082,10 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
cctrCode = cctrCodeSal;
}
remarks = "Towards Notice Pay Payable of " + daysAfter1 + "days";
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
remarks = getRemarksByFunction(empCode, relieveDate.toString(), "NPAY", "", "", noticeAd, null, null, amount2, daysAfter1, acctCode, cctrCode, conn, remarks);
detInsert = detInsert + wf_det_insert(tranID,noticeAd,adDescr,amount2,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount2,1);
//updated by nisar on 08/12/07
} //end of if(daysAfter1 > 0)
......@@ -2294,9 +2348,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
log.write("[FullFinalEJB] wf_calc_np() : amount1=====>"+amount1);
remarks = "Towards Leave Encashment of " + balanceDays1 + "days";
detInsert = detInsert + wf_det_insert(tranID,plEncash,plDescr,amount1,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount1,1);
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function][Start]
remarks = getRemarksByFunction(empCode, relieveDate.toString(), "LEAVEENC", "", "", plEncash, null, null, amount1, (int) balanceDays1, acctCode, cctrCode, conn, remarks);
detInsert = detInsert + wf_det_insert(tranID,plEncash,plDescr,amount1,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,amount1,1);
}
rs.close();
}
......@@ -2714,6 +2770,11 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
cctrCode = cctrCodeSal;
}
remarks = "Towards Gratuity For " + totalDays + "days";
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get the remarks dynamically by function]
//remarks = getRemarksByFunction(empCode, relieveDate.toString(), "GRATUITY", "", "", adCode, null, null, totalAmt, (int)totalDays, acctCode, cctrCode, conn, remarks);//Modified by Radheshyam[03/03/2014]
remarks = getRemarksByFunction(empCode,genericUtility.getValidDateTimeString( relieveDt,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()), "GRATUITY", "", "", adCode, null, null, totalAmt, (int)totalDays, acctCode, cctrCode, conn, remarks);
detInsertString = wf_det_insert(tranID,adCode,adDescr,totalAmt,nullDate,"","",acctCode,cctrCode,remarks,"","",currCode,1,totalAmt,1);
System.out.println("XML detInsertString line no : ---------->>> 2720 ["+detInsertString+ "]");
......@@ -3182,4 +3243,65 @@ public class FullFinalAct extends ActionHandlerEJB implements FullFinalActLocal,
return reqVal;
}
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get remarks dynamically from function][Start]
public String getRemarksByFunction(String empCode, String relieveDate, String tranType, String refSer, String refNo, String adCode, String startDate, String endDate, Double amount, int days,String acctCode, String cctrCode, Connection conn, String orgRemarks)
{
String sqlStr = "";
String remarks = "";
PreparedStatement pst = null;
ResultSet rs = null;
try
{
sqlStr = "select FN_HR_GET_FF_REMARKS(?,?,?,?,?,?,?,?,?,?,?,?)as remarks from dual";
pst = conn.prepareStatement(sqlStr);
pst.setString(1, empCode);
//Modified by Radheshyam[04/03/2014][to parse date in sql timestamp]
//pst.setString(2, relieveDate);
pst.setTimestamp( 2, (relieveDate != null ) ? java.sql.Timestamp.valueOf(relieveDate) :null);
pst.setString(3, tranType);
pst.setString(4, refSer);
pst.setString(5, refNo);
pst.setString(6, adCode);
//Modified by Radheshyam[04/03/2014][to parse date in sql timestamp][start]
//pst.setString(7, startDate);
//pst.setString(8, endDate);
pst.setTimestamp( 7, (startDate != null ) ? java.sql.Timestamp.valueOf(startDate) :null);
pst.setTimestamp( 8, (endDate != null ) ? java.sql.Timestamp.valueOf(endDate) :null);
//Modified by Radheshyam[04/03/2014][to parse date in sql timestamp][End]
pst.setDouble(9, amount);
pst.setInt(10, days);
pst.setString(11, acctCode);
pst.setString(12, cctrCode);
rs = pst.executeQuery();
if(rs.next())
{
remarks = rs.getString(1);
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pst != null)
{
pst.close();
pst = null;
}
System.out.println(">>>Computed Value of remarks is::"+remarks);
if(remarks == null || remarks.trim().length() <= 0 )
{
System.out.println(">>>inside condition remarks computed as null value<<<");
remarks = orgRemarks;
}
}
catch(Exception e)
{
System.out.println(e);//Added by Radheshyam[03/03/2014]
System.out.println(">>>inside catch block geting exception<<<");
remarks = orgRemarks;
}
System.out.println(">>>final return value of remarks is::"+remarks);
return remarks;
}
//Added by Radheshyam [15/01/2014][Request ID : AD3GSUN001][to get remarks dynamically from function][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