Sana S: Modified on 12/03/20

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

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

@@ -16,6 +16,7 @@ import org.w3c.dom.NodeList;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.ejb.adm.adv.PayStruChgReqDefault;
 import ibase.webitm.utility.ITMException;
 
 @Stateless
@@ -151,9 +152,11 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 
 			objName = checkNull( getObjNameFromDom(dom,"objName",1));
 
-			valueXmlString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<editFlag>" );
+			/*valueXmlString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<editFlag>" );
 			valueXmlString.append( editFlag ).append( "</editFlag>\r\n</Header>\r\n<Errors>\r\n</Errors>\r\n" );
-
+*/
+			valueXmlString = new StringBuffer("<?xml version=\"1.0\"?><Root><header><editFlag>");//Modified by Sana S on 11/03/20 
+			valueXmlString.append( editFlag ).append("</editFlag></header>");
 			Date currentDate = new Date();
 			curDate = currentDate == null ? "" : sdfAppl.format( currentDate );
 			System.out.println( "curDate::::::"+curDate );
@@ -163,7 +166,8 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 			{
 				case 1:
 				{
-					valueXmlString.append("<Detail1 domID='1' dbID='' objContext='1' objName='"+objName+"' selected='Y'>\r\n");
+					valueXmlString.append("<Detail1>");//Modified by Sana S on 11/03/20 
+					//valueXmlString.append("<Detail1 domID='1' dbID='' objContext='1' objName='"+objName+"' selected='Y'>\r\n");
 					if( "itm_default".equalsIgnoreCase( currentColumn.trim() ) )
 					{
 						tranDateStr = curDate;
@@ -220,7 +224,6 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 							pstmt = null;
 						}	
 	
-	
 						sql = "select case when a.emp_fname_long is null then a.emp_fname else a.emp_fname_long end as emp_fname,case when a.emp_mname_long is null then a.emp_mname else a.emp_mname_long end as emp_mname,case when a.emp_lname_long is null then a.emp_lname else a.emp_lname_long end as emp_lname from employee a where a.emp_code = ?";
 						pstmt = conn.prepareStatement(sql);
 	
@@ -234,7 +237,6 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 								empMname = checkNull( rs.getString("emp_mname") );
 								empLname = checkNull( rs.getString("emp_lname") );
 								empNameAprv = empFname.trim() + " " + empMname.trim() + " " + empLname.trim();
-								
 							}
 							rs.close();
 						}
@@ -266,7 +268,6 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 								empMname = checkNull( rs.getString("emp_mname") );
 								empLname = checkNull( rs.getString("emp_lname") );
 								empNameAuth2 = empFname.trim() + " " + empMname.trim() + " " + empLname.trim();
-								
 							}
 							rs.close();
 						}
@@ -319,8 +320,7 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 								haTip = "";
 							}
 						}
-
-						
+						System.out.println("set values");
 						valueXmlString.append( "<tran_date><![CDATA[").append( tranDateStr ).append("]]></tran_date>");
 						valueXmlString.append( "<emp_code><![CDATA[").append( empCode ).append("]]></emp_code>");
 						valueXmlString.append( "<wf_status><![CDATA[").append( wfStatus ).append("]]></wf_status>" );
@@ -350,6 +350,7 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 						valueXmlString.append( "<pay_site><![CDATA[").append( paySite ).append("]]></pay_site>" );
 						valueXmlString.append( "<site_descr><![CDATA[").append( siteDescr ).append("]]></site_descr>" );
 						valueXmlString.append( "<ha_tip><![CDATA[").append( haTip ).append("]]></ha_tip>" );
+						System.out.println("set values");
 					}
 					else if ("ad_alloc_group".equalsIgnoreCase( currentColumn ) )
 					{
@@ -362,8 +363,11 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 						{
 							sql = "select descr as ad_alloc_group_descr,DDF_GET_HA_TIP(?,?) AS HA_TIP from ALLWDEDN where AD_CODE= ? ";
 							pstmt = conn.prepareStatement(sql);
-							pstmt.setString( 1, adCode );
-							pstmt.setString( 2, empCode );
+							
+							pstmt.setString( 1, empCode );//Modified by Sana S on 11/03/20 for parameter passing order mismatch
+							pstmt.setString( 2, adCode );
+							/*pstmt.setString( 1, adCode );// commented by Sana S on 11/03/20 for parameter passing order mismatch
+							pstmt.setString( 2, empCode );*/
 							pstmt.setString( 3, adCode );
 							rs = pstmt.executeQuery();
 							if(rs.next())
@@ -406,15 +410,17 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 				break;
 			case 2 :
 			{
+				
 				valueXmlString.append("<Detail2>\r\n");
 				System.out.println("*Before itm_default OF CASE 2:"+currentColumn);
 
 				if(currentColumn.trim().equals("itm_default"))
 				{
+					
 				}
 				else if (currentColumn.trim().equals("itm_defaultedit"))
 				{
-
+					
 				}
 				else if (currentColumn.trim().equals("amount"))
 				{
@@ -429,6 +435,7 @@ public class PayStruChgReqTrnIC extends ValidatorEJB implements PayStruChgReqTrn
 			break;
 			}
 			valueXmlString.append("</Root>");
+			
 		}	
 		catch(Exception e)
 		{