*Updated component of Leave Laps [20-01-2020]

AutoLeaveLapsPrc.java


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

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

@@ -145,8 +145,13 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 			lveCodeFr=checkNull(genericUtility.getColumnValue("lve_code__fr", dom));
 			lveCodeTo=checkNull(genericUtility.getColumnValue("lve_code__to", dom));
 			lapsOnDate = checkNull(genericUtility.getColumnValue("laps_on_date", dom));
-			lapsdate = Timestamp.valueOf(genericUtility.getValidDateString(lapsOnDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-			System.out.println(":::::::lapsdate= "+lapsdate);
+			
+			if(lapsOnDate != null)
+			{
+				lapsdate = Timestamp.valueOf(genericUtility.getValidDateString(lapsOnDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+				System.out.println(":::::::lapsdate= "+lapsdate);
+			}
+			
 			procGroupFr=checkNull(genericUtility.getColumnValue("proc_group__fr", dom));
 			procGroupTo=checkNull(genericUtility.getColumnValue("proc_group__to", dom));
 			lsProcess=checkNull(genericUtility.getColumnValue("process_for", dom));
@@ -179,7 +184,7 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 				siteCodeTo = "z"; 			
 			}
 
-			if(lapsdate == null)
+			if(lapsOnDate == null)
 			{
 				lapsdate = utilMethod.dateTime(utilMethod.today());
 				System.out.println(":::::::::::::if lapsdate is null:::::::::::::::: "+lapsdate);
@@ -228,8 +233,8 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 			pstmt.setString(4,lveCodeTo);
 			pstmt.setString(5,siteCodeFr);
 			pstmt.setString(6,siteCodeTo);
-			pstmt.setString(7,lapsOnDate);
-			pstmt.setString(8,lapsOnDate);
+			pstmt.setTimestamp(7,lapsdate);
+			pstmt.setTimestamp(8,lapsdate);
 			pstmt.setString(9,deptCodeFr);
 			pstmt.setString(10,deptCodeTo);
 			pstmt.setString(11,procGroupFr);
@@ -261,8 +266,11 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 				pstmt.close();
 				pstmt = null;
 			}
+			System.out.println("dataMap -->"+dataMap);
 
 			llRowCnt = dataMap.size();
+			
+			System.out.println("llRowCnt -->"+llRowCnt);
 
 			if(llRowCnt <= 0)
 			{
@@ -347,7 +355,12 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 					}
 					rs1.close();
 					pstmt1.clearParameters();
-					//
+					
+					System.out.println("lsSite --> "+lsSite);
+					System.out.println("lsGrade --> "+lsGrade);
+					System.out.println("lsCadre --> "+lsCadre);
+					System.out.println("lsEmpsite --> "+lsEmpsite);
+					System.out.println("lsPaysite --> "+lsPaysite);
 
 					pstmt2.setString(1,lsSite);
 					pstmt2.setString(2,lsGrade);
@@ -359,6 +372,7 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 					rs2.close();
 					pstmt2.clearParameters();
 
+					System.out.println("lveTblno --> "+lveTblno);
 
 					if(lveTblno ==null ||  lveTblno.trim().length() == 0)
 					{
@@ -369,12 +383,12 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 						if (rs3.next()) 
 						{
 							lveTblno = checkNull(rs3.getString("lve_tblno"));
-							System.out.println("lveTblno = "+lveTblno);
+							System.out.println("lveTblno ===== "+lveTblno);
 						}
 						rs3.close();
 						pstmt3.clearParameters();
 					}
-					//
+					
 					pstmt4.setString(1,lveTblno);
 					pstmt4.setString(2,lveCode);
 					rs4 = pstmt4.executeQuery();
@@ -387,19 +401,19 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 					pstmt4.clearParameters();
 
 					xmlStringBuffer.append("<max_days><![CDATA[").append(maxAccumulate).append("]]></max_days>");
-
-
+					
 					lsWorksite = lsSite;
 					lcBalDays = 0.00;
-
+					
+					System.out.println("lsWorksite --> "+lsWorksite);
+					
 					if("D".equalsIgnoreCase(lsProcess))
 					{
-						//select FN_GET_LAPSE_LVEBAL( :ls_emp , :ls_lve_code , :ld_laps_on_date , :ld_proc_date , :ls_empsite , :ls_worksite , :ls_paysite , :ls_grade , :ls_cadre , :ls_lve_tblno ) into :lc_bal_days from dual;
 						sql5="select FN_GET_LAPSE_LVEBAL( ? , ? , ? , ? , ? , ? , ? , ? , ? , ?) as lc_bal_days from dual ";
 						pstmt5 = conn.prepareStatement(sql5);
 						pstmt5.setString(1,lsEmpCode);
 						pstmt5.setString(2,lveCode);
-						pstmt5.setString(3,lapsOnDate);
+						pstmt5.setTimestamp(3,lapsdate);
 						pstmt5.setTimestamp(4,ldProcDate);
 						pstmt5.setString(5,lsEmpsite);
 						pstmt5.setString(6,lsWorksite);
@@ -607,9 +621,7 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 		String workSite="";
 		String lveCode="";
 		int ccBal=0;
-		//int maxDays=0;
 		double maxDays=0.0;
-		//int lapsDays=0;
 		double lapsDays=0.0;
 		int cnt = 0;
 		String tranId="";
@@ -650,7 +662,7 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 			gbflogWriterMap.put("loginSite", loginSite);
 			gbflogWriterMap.put("xtraParams", xtraParams);
 			gbflogWriterMap.put("fileNameStartName", fileNameStartName);
-			logWriter = admCommon.initializeLogWriter(gbflogWriterMap,headerDom, logConn);
+			logWriter = admCommon.initializeLogWriter(gbflogWriterMap, headerDom, logConn);
 
 			errorCode = logWriter.getReturnUpdError();
 			if(errorCode != null && errorCode.trim().length() > 0)
@@ -675,12 +687,14 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 
 
 			lapsOnDate = checkNull(genericUtility.getColumnValue("laps_on_date", headerDom));
+			
 			ldLaps = Timestamp.valueOf(genericUtility.getValidDateString(lapsOnDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 			System.out.println(":::::::ldLaps= "+ldLaps);
-			if(ldLaps == null)
+			
+			if(lapsOnDate == null)
 			{
 				ldLaps = utilMethod.dateTime(utilMethod.today());
-				System.out.println(":::::::::::::if ldLaps is null:::::::::::::::: "+ldLaps);
+				System.out.println("if ldLaps is null --> "+ldLaps);
 			}
 
 			sql="select key_string from transetup where upper(tran_window) = 'W_EMPLEAVE'";
@@ -757,8 +771,8 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 			pstmt1.setString(4,lveCodeTo);
 			pstmt1.setString(5,siteCodeFr);
 			pstmt1.setString(6,siteCodeTo);
-			pstmt1.setString(7,lapsOnDate);
-			pstmt1.setString(8,lapsOnDate);
+			pstmt1.setTimestamp(7,ldLaps);
+			pstmt1.setTimestamp(8,ldLaps);
 			pstmt1.setString(9,deptCodeFr);
 			pstmt1.setString(10,deptCodeTo);
 			pstmt1.setString(11,procGroupFr);
@@ -1096,7 +1110,6 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 	}
 
 
-
 	private String checkNull(String input) 
 	{
 		if (input == null)
@@ -1106,14 +1119,4 @@ public class AutoLeaveLapsPrc extends ProcessEJB  implements AutoLeaveLapsPrcLoc
 		return input;
 	}
 
-	/*private String checkInt(String input) 
-	{
-		if (input == null)
-		{
-			input = "0";
-		}
-		return input;
-	}*/
-
-
 }