updated on[11-12-2019] compared code and add changes done by varsha mam

AdmCommon.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213382 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/src/ibase/webitm/ejb/adm/AdmCommon.java

@@ -36,6 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.BaseLogger;
 import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.bean.adm.LogWriterDatabase;
@@ -1573,7 +1574,7 @@ public class AdmCommon
 	public String chkHRMSiteAccess(String empCode , Date asOfDate , String loginSite , String userId, int userLevel, String loginEmpCode , String winName ,Connection conn) throws ITMException
 	// modified by Poonam B[02/12/2019][To remove emp_site variable][END]	
 	{
-		String status = "",errString="";
+		String status = "",errString = "";
 		//modified by Poonam B[02/12/2019][to get relieveDateTS in Timestamp][START]
 		//String relieveDateStr = "";
 		Timestamp relieveDateTS = null;
@@ -1810,7 +1811,8 @@ public class AdmCommon
 					pstmt = null ; 
 				}
 			} 
-			catch (SQLException e) {
+			catch (SQLException e) 
+			{
 				e.printStackTrace();
 			}
 		}
@@ -2078,7 +2080,7 @@ public class AdmCommon
 				if (rs.next())
 				{
 					siteAccCol = rs.getString("site_acc_col");
-					System.out.println("siteAccCol ::: "+siteAccCol);
+					System.out.println("siteAccCol::: "+siteAccCol);
 				}
 				if (rs != null)
 				{
@@ -2731,7 +2733,7 @@ public class AdmCommon
 				e.printStackTrace();
 			}
 		}
-		System.out.println("Final HashMap fetchEmpMap from fetchEmpMstInfo :::::" +fetchEmpMap);
+		System.out.println("Final HashMap fetchEmpMap from fetchEmpMst Info:::::" +fetchEmpMap);
 		return fetchEmpMap;
 	} 
 	//Added by Poonam B[02/12/2019][END][method to get employee information]
@@ -6326,7 +6328,7 @@ public class AdmCommon
 						}
 						else
 						{
-							//Added By Poonam B[18/11/2019][END]
+							//Added By Poonam B[19/11/2019][END]
 							if(inputType.contains("String"))
 							{
 								pstmt.setString(counter, obj.toString());
@@ -6406,6 +6408,7 @@ public class AdmCommon
 			//Modified By Poonam B[18/11/2019][START]
 			//throw new ITMException(e);
 			errorCode = "CONFIGUREERR\t"+e.getMessage();
+
 			returnMap.put("errorcode", errorCode);
 			returnMap.put("value", 0.0d);
 			//Modified By Poonam B[18/11/2019][END]
@@ -6726,12 +6729,6 @@ public class AdmCommon
 						{
 							retval = mamount;
 						}
-							if(mminamt > 0 && retval < mminamt) 
-								retval = mminamt;
-							if(mmaxamt > 0 && retval > mmaxamt) 
-								retval = mmaxamt;
-							break;
-						}
 					}
 					else
 					{
@@ -6776,6 +6773,7 @@ public class AdmCommon
 					pstmt = null;
 				}
 			}
+		}
 		catch(Exception e)
 		{
 			e.printStackTrace();
@@ -6815,4 +6813,52 @@ public class AdmCommon
 		return timeStampValue;
 	}
 	//Added By Vikas Lagad on 13-09-2019[To get timestamp value] End
+
+	//Added by Varsha V on 28-11-19 as per suggested by Sir
+	public double gfCallPayrollDdf(String empcode, String prdcode, String proctype, String calctype, double acNewamt, String adcode, Connection conn) throws SQLException, ITMException
+	{
+		double retAmt = 0.0;
+		String sql = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		System.out.println("gfCallPayrollDdf Method called");
+		try
+		{
+			sql = "select nvl(ddf_pyrl_calc(?,?,?,?,?,?),0) as ret_amt from dual";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, empcode);
+			pstmt.setString(2, prdcode);
+			pstmt.setString(3, proctype);
+			pstmt.setString(4, calctype);
+			pstmt.setDouble(5, acNewamt);
+			pstmt.setString(6, adcode);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				retAmt = rs.getDouble("ret_amt");
+			}
+		}
+		catch(Exception e)
+		{
+			System.out.println(e.getMessage());
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			if(rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+		}
+		return retAmt;
+	}
+
+	//Ended by Varsha V on 28-11-19 as per suggested by Sir
 }