AttdDailyPos.java

-Commited on behalf of Rohini T. 
- Bug fixing in processing attendance

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

webitm-adm/ibase/webitm/ejb/adm/AttdDailyPos.java

@@ -123,11 +123,6 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
 				attdUpdCnt = pstmt.executeUpdate();
 				System.out.println("AttdDailyPos - ATTENDANCE_DAY UPDATE COUNT [" + attdUpdCnt + "]");
 			}
-			if (rs != null)
-			{
-				rs.close();
-				rs = null;
-			}
 			if (pstmt != null)
 			{
 				pstmt.close();
@@ -138,6 +133,26 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
 			if (toUpdate)
 			{
 				//Modified by Rohini Telang on 25/March/2019[Req ID: A17DSUN001][START]  
+				sql = "SELECT code,TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setTimestamp(1,attdDate);
+				rs = pstmt.executeQuery();
+				if (rs.next())
+				{
+					prdCode = rs.getString("code");
+					toDate = rs.getTimestamp("TO_DATE");
+				}
+				if(rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if(pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				
 				sql = "SELECT COUNT(*) AS CNT FROM  ATTENDANCE_MON WHERE EMP_CODE  = ? AND PRD_CODE = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,empCode);
@@ -147,7 +162,6 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
 				{
 					 cnt = rs.getInt("CNT");
 					 System.out.println("cnt"+cnt);
-					
 				}
 				if(rs != null ) 
 				{
@@ -166,26 +180,6 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
 					System.out.println("autolveapav---["+autolveapav+"]");
 					if("A".equalsIgnoreCase(autolveapav))
 					{
-						sql = "SELECT code,TO_DATE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE";
-						pstmt = conn.prepareStatement(sql);
-						pstmt.setTimestamp(1,attdDate);
-						rs = pstmt.executeQuery();
-						if (rs.next())
-						{
-							prdCode = rs.getString("code");
-							toDate = rs.getTimestamp("TO_DATE");
-						}
-						if(rs != null)
-						{
-							rs.close();
-							rs = null;
-						}
-						if(pstmt != null)
-						{
-							pstmt.close();
-							pstmt = null;
-						}
-					
 						sql = "SELECT PROC_WINDOW , CASE WHEN ADDON_DAYS IS NULL THEN 0 ELSE ADDON_DAYS END AS ADDON_DAYS FROM  ATTENDANCE_MON WHERE EMP_CODE  = ? AND PRD_CODE = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,empCode);