Updated EJB for Report Request

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

webitm-dis/ibase/webitm/ejb/dis/ReportRequestWiz.java

@@ -124,9 +124,10 @@ public class ReportRequestWiz extends ValidatorEJB implements ReportRequestWizRe
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
-						/*else
+						else
 						{
 							System.out.println("Inside wfValData report!null");
+							reportName=reportName.substring(2);
 							sql="select count(*) from gencodes where fld_name='REPORT_NAME' and mod_name='W_REPORT_REQUEST_WIZ' and descr like ? order by descr ";
 							System.out.println("sql:::"+sql);
 							pstmt = conn.prepareStatement(sql);
@@ -137,7 +138,7 @@ public class ReportRequestWiz extends ValidatorEJB implements ReportRequestWizRe
 								cnt =  rs.getInt(1);
 								if(cnt == 0) 
 								{
-									errCode = "ERRORMSG";
+									errCode = "VTINVREP";
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());	
 								}									
@@ -147,7 +148,7 @@ public class ReportRequestWiz extends ValidatorEJB implements ReportRequestWizRe
 							rs = null;
 							pstmt.close();
 							pstmt = null;
-						}*/
+						}
 					}
 				}
 						
@@ -473,9 +474,11 @@ public class ReportRequestWiz extends ValidatorEJB implements ReportRequestWizRe
 			}
 			else
 			{
-				selectSql = "select descr,sh_descr from gencodes where fld_name='REPORT_NAME' and mod_name='W_REPORT_REQUEST_WIZ' and descr like ? order by descr ";
+				/*selectSql = "select descr,sh_descr from gencodes where fld_name='REPORT_NAME' and mod_name='W_REPORT_REQUEST_WIZ' and descr like ? order by descr ";
+				pstmt = conn.prepareStatement(selectSql);
+				pstmt.setString(1, "%"+reportName+"%");*/
+				selectSql = "select descr,sh_descr from gencodes where fld_name='REPORT_NAME' and mod_name='W_REPORT_REQUEST_WIZ' order by descr";
 				pstmt = conn.prepareStatement(selectSql);
-				pstmt.setString(1, "%"+reportName+"%");
 				rs = pstmt.executeQuery();
 				int num = 1;
 				while (rs.next())

webitm-dis/ibase/webitm/ejb/dis/adv/ReportRequestConf.java

@@ -6,6 +6,7 @@ import java.io.File;
 import java.io.OutputStreamWriter;
 import java.rmi.RemoteException;
 import java.sql.*;
+import java.text.SimpleDateFormat;
 import java.util.TreeMap;
 import ibase.ejb.*;
 import ibase.utility.CommonConstants;
@@ -55,8 +56,8 @@ public class ReportRequestConf
 		
 		int updCnt=0;
 		
-		boolean isError=false;
-		
+		boolean isError= false;
+		Timestamp currDate = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -67,6 +68,9 @@ public class ReportRequestConf
 			conn = connDriver.getConnectDB("DriverITM");
 			connDriver = null;
 			conn.setAutoCommit(false);
+			SimpleDateFormat sdfDB = new SimpleDateFormat(genericUtility.getDBDateFormat());
+			currDate =  java.sql.Timestamp.valueOf(sdfDB.format(new java.util.Date()).toString() + " 00:00:00.0");
+			System.out.println(">>>>>>currDate:"+currDate);
 			if(empCodeAprv!=null && empCodeAprv.trim().length() > 0)
 			{
 				empCodeAprv= empCodeAprv.trim();
@@ -111,8 +115,29 @@ public class ReportRequestConf
 				System.out.println(">>>After Calling ReportRequestConf sendMailReport retString:"+retString);
 				if(retString.indexOf("REPORTSUCC") > -1) 
 				{
+					
+					//sql = " update pob_hdr set confirmed = 'Y', conf_date = ?, " +
+					//		"emp_code__aprv = ?, wf_status='C', status_date= ? where tran_id = ? ";
 					System.out.println(">>>In ReportRequestConf Transaction Successful");
-					retString = "Y";
+					System.out.println(">>>Before update wf_status as Closed<<<");
+					sql= "update report_req set wf_status='C', status_date= ?, emp_code__aprv = ? where tran_id= ? ";
+					pstmt=conn.prepareStatement(sql);
+					pstmt.setTimestamp(1, currDate);
+					pstmt.setString(2, empCodeAprv);
+					pstmt.setString(3, tranId);
+					updCnt= pstmt.executeUpdate();
+					pstmt.close();
+					pstmt= null;
+					System.out.println(">>>After REPORTSUCC report_req update updCnt:"+ updCnt);
+					if(updCnt > 0)
+					{
+						System.out.println(">>>In ReportRequestConf Transaction Rejected Successfuly");
+						retString = "Y";
+					}
+					else
+					{
+						isError=true;
+					}
 				}
 				else
 				{
@@ -125,9 +150,11 @@ public class ReportRequestConf
 				if(tranId!= null && tranId.trim().length() > 0)
 				{
 					System.out.println(">>>Before update wf_status as Reject<<<");
-					sql= "update report_req set wf_status='R' where tran_id= ? ";
+					sql= "update report_req set wf_status='R',status_date= ?,emp_code__aprv = ? where tran_id= ? ";
 					pstmt=conn.prepareStatement(sql);
-					pstmt.setString(1, tranId);
+					pstmt.setTimestamp(1, currDate);
+					pstmt.setString(2, empCodeAprv);
+					pstmt.setString(3, tranId);
 					updCnt= pstmt.executeUpdate();
 					pstmt.close();
 					pstmt= null;
@@ -148,6 +175,7 @@ public class ReportRequestConf
 		{
 			try 
 			{
+				isError= true;
 				conn.rollback();
 			} 
 			catch (SQLException e1) 
@@ -166,12 +194,12 @@ public class ReportRequestConf
 				System.out.println(">>In finally ReportRequestConf Check isError:"+isError);
 				if(!isError)
 				{
-					//conn.commit();
+					conn.commit();
 					System.out.println(">>>>ReportRequestConf Connection commit successfuly");
 				}
 				else
 				{
-					//conn.rollback();
+					conn.rollback();
 					System.out.println(">>>>ReportRequestConf Connection rollback successfuly");
 				}
 				if(conn != null)
@@ -411,7 +439,7 @@ public class ReportRequestConf
 					pstmt.close();
 					pstmt = null;
 				}
-				conn.close();
+				//conn.close();
 			}
 			catch(Exception e)
 			{