SY90SUN012-modification in logic

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

webitm-sys/ibase/webitm/ejb/sys/DownloadCSVBatchBean.java

@@ -186,7 +186,7 @@ public class DownloadCSVBatchBean  implements Schedule
 							trfCycle = rs.getString( "INV_TRF_CYCLE" );
 				
 							// 29/03/10 sachin---to store file in new format as IDDMM<invoice id>.CSV 
-							dnldFileName = "I"+ dt + tranId;
+							dnldFileName = "I"+ dt + tranId.trim();
 							
 							tranFileMip.put( "tranId", tranId );
 							tranFileMip.put( "dnldFileName", dnldFileName );
@@ -241,27 +241,15 @@ public class DownloadCSVBatchBean  implements Schedule
 							
 							if(trfCycle != null && trfCycle.equalsIgnoreCase( "O" ))
 							{
-								if("S".equalsIgnoreCase(trfType))
-								{
-									pstmtSeq = conn.prepareStatement( " SELECT IV.DOWNLOAD_FLAG "
-									+" FROM INVOICE IV, SITE_CUSTOMER SC "
-									+" WHERE IV.CUST_CODE__BIL = SC.CUST_CODE "
-									+" AND IV.SITE_CODE = SC.SITE_CODE "
-									+" AND IV.TRAN_DATE BETWEEN  ? AND ? "
-									+" AND IV.SITE_CODE = ? "
-									+" AND IV.CUST_CODE = ? " 
-									+" AND IV.DOWNLOAD_FLAG = 'Y' " );
-								}
-								else
-								{
-									pstmtSeq = conn.prepareStatement( " SELECT IV.INV_EXP_DATE "
-									+" FROM INVOICE IV, SITE_CUSTOMER SC "
-									+" WHERE IV.CUST_CODE__BIL = SC.CUST_CODE "
-									+" AND IV.SITE_CODE = SC.SITE_CODE AND IV.INV_EXP_DATE IS NOT NULL "
-									+" AND IV.TRAN_DATE BETWEEN  ? AND ? "
-									+"  AND IV.SITE_CODE = ? "
-									+" AND IV.CUST_CODE = ? " );
-								}
+								pstmtSeq = conn.prepareStatement( " SELECT IV.INV_EXP_DATE "
+										+" FROM INVOICE IV, SITE_CUSTOMER SC "
+										+" WHERE IV.CUST_CODE__BIL = SC.CUST_CODE "
+										+" AND IV.SITE_CODE = SC.SITE_CODE AND IV.INV_EXP_DATE IS NOT NULL "
+										+" AND IV.TRAN_DATE BETWEEN  ? AND ? "
+										+" AND IV.SITE_CODE = ? "
+										+" AND IV.CUST_CODE = ? "
+										+" AND IV.DOWNLOAD_FLAG = 'Y' " );
+								
 								pstmtSeq.setTimestamp(1, fromDate);
 								pstmtSeq.setTimestamp(2, toDate);
 								pstmtSeq.setString(3, siteCode);
@@ -271,7 +259,7 @@ public class DownloadCSVBatchBean  implements Schedule
 								if( rsSeq.next() )
 								{
 									updateFlag(tranId, conn);
-									System.out.println("Inside S & O already downloaded ");
+									//System.out.println("Inside S & O already downloaded ");
 								}
 								else
 								{	
@@ -292,8 +280,9 @@ public class DownloadCSVBatchBean  implements Schedule
 									}
 									else if("S".equalsIgnoreCase(trfType))
 									{
-										updateFlag(tranId, conn);
-										System.out.println("Inside S & O ");
+										//updateFlag(tranId, conn);
+										retString = "updateDate";
+										//System.out.println("Inside S & O ");
 									}
 								}
 								rsSeq.close();
@@ -320,8 +309,9 @@ public class DownloadCSVBatchBean  implements Schedule
 								}
 								else if("S".equalsIgnoreCase(trfType))
 								{
-									updateFlag(tranId, conn);
-									System.out.println("Inside S & A ");
+									//updateFlag(tranId, conn);
+									retString = "updateDate";
+									//System.out.println("Inside S & A ");
 									
 								}						
 							}
@@ -495,12 +485,9 @@ public class DownloadCSVBatchBean  implements Schedule
 		String retString = "";
 		String to = "";
 		String from = "";
-		String cc = "";
 		boolean debug = false;
 		String subject = "",text = "";
 		String xmlDataFilePath = "";
-		java.sql.PreparedStatement pstmtSeq2 = null;
-		java.sql.ResultSet rsSeq = null; 
 		
 		try 
 		{
@@ -514,21 +501,7 @@ public class DownloadCSVBatchBean  implements Schedule
 			MimeBodyPart mbp1 = new MimeBodyPart();
 			MimeBodyPart mbp2 = new MimeBodyPart();
 			Multipart mp = new MimeMultipart();
-			
-			pstmtSeq2 = conn.prepareStatement( "SELECT VAR_VALUE FROM DISPARM "
-			+" WHERE VAR_NAME = 'MAIL_CC' " );
-
-			rsSeq = pstmtSeq2.executeQuery();
-			if( rsSeq.next() )
-			{
-				cc = rsSeq.getString( "VAR_VALUE" );
-				System.out.println("cc =="+ cc);
-			}
-			rsSeq.close();
-			rsSeq = null;
-			pstmtSeq2.close();
-			pstmtSeq2 = null;
-			
+						
 			from = CommonConstants.MAILFROM;
 			to = (String)hMap.get("TO_ADDR");
 			
@@ -557,10 +530,7 @@ public class DownloadCSVBatchBean  implements Schedule
 			mp.addBodyPart(mbp2);
 			
 			msg.setRecipients(Message.RecipientType.TO, address);
-			if(cc != null && cc.trim().length() > 0){
-				InternetAddress[] ccAddress = {new InternetAddress(cc)};
-				msg.setRecipients(Message.RecipientType.CC, ccAddress);
-			}
+			
 			msg.setSubject(subject);						
 			msg.setFrom(new InternetAddress(from));	
 			msg.setContent(mp);