Sana S: Modified on 11/11/19

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

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

@@ -161,25 +161,35 @@ public class PayrollProcess extends ProcessEJB implements PayrollProcessLocal,Pa
 
 			System.out.print("EmpCodeList:"+EmpCodeList.size());
 
-			
-			sql = "update payroll set remarks  = ? where "
+			//Modified by Sana S on 11/11/19 [start] 
+			/*sql = "update payroll set remarks  = ? where "
 					+ "prd_code between ? and ? and "
-					+ "emp_code = ? ";
+					+ "emp_code = ? ";*/
+			
+			sql = "update payroll set payroll.remarks  = ? where "
+					+ "payroll.prd_code between ? and ? and "
+					+ "payroll.emp_code = ? ";
+			
+			//Modified by Sana S on 11/11/19 [end] 
 
-			pstmt = con.prepareStatement(sql);
 			
 			for(int i = 0; i < EmpCodeList.size(); i++)
 			{
-				System.out.print("Inside Update");
+				sql = "update payroll set payroll.remarks  = ? where "
+						+ "payroll.prd_code between ? and ? and "
+						+ "payroll.emp_code = ? ";
 				
+				System.out.print("Inside Update");
+				pstmt = con.prepareStatement(sql);
 				pstmt.setString(1, remarks);
 				pstmt.setString(2, fromPrd);
 				pstmt.setString(3, toPrd);
 				pstmt.setString(4, EmpCodeList.get(i));
 
-				rs = pstmt.executeQuery();
-
-				while(rs.next())
+				//Modified by Sana S on 11/11/19 [Start]
+				//rs = pstmt.executeQuery();
+				Cnt=pstmt.executeUpdate();
+				/*while(rs.next())
 				{
 					Cnt++;
 				}
@@ -187,7 +197,8 @@ public class PayrollProcess extends ProcessEJB implements PayrollProcessLocal,Pa
 				{
 					rs.close();
 					rs = null;
-				}
+				}*/
+				//Modified by Sana S on 11/11/19 [end]
 				if(pstmt != null)
 				{
 					pstmt.close();
@@ -195,10 +206,11 @@ public class PayrollProcess extends ProcessEJB implements PayrollProcessLocal,Pa
 				}
 			}
 			System.out.print("Cnt:"+Cnt);
-			if(ls_base.trim().length() > 0)
+			//Modified by Sana S on 11/11/19 [start]
+			/*if(ls_base.trim().length() > 0)
 			{
 				con.rollback();
-				errorStr = itmDbAcess.getErrorString("", "", userId, "", con); 
+				errorStr = itmDbAcess.getErrorString("", "DS000", userId, "", con); 
 				return errorStr;
 			}
 			else
@@ -206,7 +218,23 @@ public class PayrollProcess extends ProcessEJB implements PayrollProcessLocal,Pa
 				con.commit();
 				errorStr = itmDbAcess.getErrorString("", "VPSUCC1", userId, "", con); 
 				return errorStr;
+			}*/
+			
+			if(Cnt > 0)
+			{
+				con.commit();
+				errorStr = itmDbAcess.getErrorString("", "VPSUCC1", userId, "", con); 
+				return errorStr;
+				
+				
+			}
+			else 
+			{
+				con.rollback();
+				errorStr = itmDbAcess.getErrorString("", "DS000", userId, "", con); 
+				return errorStr;
 			}
+			//Modified by Sana S on 11/11/19 [end]
 		}
 		catch (Exception e) 
 		{