Skip to content

B
business-java
Commit 80d4a681 authored by manohar's avatar manohar
Browse files
Options

Deprecated method related to date assignment and conversion removed 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97498 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f5043250
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 31 deletions
webitm-fin/ibase/webitm/ejb/fin/AssetRegisterIC.java
View file @ 80d4a681
...@@ -3,6 +3,7 @@ package ibase.webitm.ejb.fin; ...@@ -3,6 +3,7 @@ package ibase.webitm.ejb.fin;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.text.*; import java.text.*;
import java.util.Date; import java.util.Date;
import java.util.Calendar;
import java.sql.*; import java.sql.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import org.w3c.dom.*; import org.w3c.dom.*;
...@@ -262,10 +263,14 @@ public class AssetRegisterIC extends ValidatorEJB implements AssetRegisterICRemo ...@@ -262,10 +263,14 @@ public class AssetRegisterIC extends ValidatorEJB implements AssetRegisterICRemo
{ {
vuptodate = Timestamp.valueOf(genericUtility.getValidDateString(vuptodatestr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); vuptodate = Timestamp.valueOf(genericUtility.getValidDateString(vuptodatestr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
effDate = Timestamp.valueOf(genericUtility.getValidDateString(effdatestr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); effDate = Timestamp.valueOf(genericUtility.getValidDateString(effdatestr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
int effcDtMon = effDate.getMonth(); Calendar cal = Calendar.getInstance();
int vldUtDtMon = vuptodate.getMonth(); cal.setTimeInMillis(effDate.getTime());
int effcDtYr = effDate.getYear();
int vldUtDtYr = vuptodate.getYear(); int effcDtMon = cal.get(Calendar.MONTH);
int effcDtYr = cal.get(Calendar.YEAR);
cal.setTimeInMillis(vuptodate.getTime());
int vldUtDtMon = cal.get(Calendar.MONTH);
int vldUtDtYr = cal.get(Calendar.YEAR);
if( effDate.compareTo ( vuptodate ) > 0 ) if( effDate.compareTo ( vuptodate ) > 0 )
{ {
......
webitm-fin/ibase/webitm/ejb/fin/AutoPmtGen.java
View file @ 80d4a681
...@@ -362,7 +362,10 @@ public class AutoPmtGen extends ValidatorEJB implements AutoPmtGenLocal,AutoPmtG ...@@ -362,7 +362,10 @@ public class AutoPmtGen extends ValidatorEJB implements AutoPmtGenLocal,AutoPmtG
} }
//Added by Jaimin 30/07/2007 //Added by Jaimin 30/07/2007
String payDate= genericUtility.getColumnValue("date__pay",dom); String payDate= genericUtility.getColumnValue("date__pay",dom);
Date payDt = new Date(payDate); //Date payDt = new Date(payDate);
SimpleDateFormat sdf = null;
sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
Date payDt = sdf.parse(genericUtility.getValidDateString(payDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
errCode = itmDBAccessEJB.nfCheckPeriod("FIN",payDt,siteCode,conn); errCode = itmDBAccessEJB.nfCheckPeriod("FIN",payDt,siteCode,conn);
if(errCode != "") if(errCode != "")
{ {
......
webitm-fin/ibase/webitm/ejb/fin/InterCompReconcile.java
View file @ 80d4a681
...@@ -1010,7 +1010,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1010,7 +1010,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
return valueXmlString; return valueXmlString;
} }
private ArrayList<ArrayList> buildTraceData(ArrayList<ArrayList> rs) throws Exception /*private ArrayList<ArrayList> buildTraceData(ArrayList<ArrayList> rs) throws Exception
{ {
System.out.println("In buildTraceData"); System.out.println("In buildTraceData");
ArrayList<ArrayList> arrayListData = new ArrayList<ArrayList>(); ArrayList<ArrayList> arrayListData = new ArrayList<ArrayList>();
...@@ -1026,9 +1026,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1026,9 +1026,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
dramt = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString()); dramt = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString());
cramt = rs.get(itr).get(6) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(6).toString()); cramt = rs.get(itr).get(6) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(6).toString());
tempAmt = dramt + cramt; tempAmt = dramt + cramt;
/*System.out.println("refid["+refId+"],=["+rs.get(itr).get(2).toString().trim()+"]"); //System.out.println("refid["+refId+"],=["+rs.get(itr).get(2).toString().trim()+"]");
System.out.println("refDate["+refDate+"],=["+rs.get(itr).get(0).toString().trim()+"]"); //System.out.println("refDate["+refDate+"],=["+rs.get(itr).get(0).toString().trim()+"]");
System.out.println("refAmt["+refAmt+"],=["+tempAmt+"]");*/ //System.out.println("refAmt["+refAmt+"],=["+tempAmt+"]");
if(refId.equalsIgnoreCase(rs.get(itr).get(2).toString().trim()) && refDate.equalsIgnoreCase(rs.get(itr).get(0).toString().trim()) && refAmt == tempAmt) if(refId.equalsIgnoreCase(rs.get(itr).get(2).toString().trim()) && refDate.equalsIgnoreCase(rs.get(itr).get(0).toString().trim()) && refAmt == tempAmt)
{ {
traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1)); traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1));
...@@ -1047,7 +1047,11 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1047,7 +1047,11 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
refAmt = tempAmt; refAmt = tempAmt;
traceData = null; traceData = null;
traceData = new ArrayList<String>(); traceData = new ArrayList<String>();
java.util.Date date = new java.util.Date(rs.get(itr).get(0).toString()); //java.util.Date date = new java.util.Date(rs.get(itr).get(0).toString());
SimpleDateFormat sdf = null;
sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
Date payDt = sdf.parse(genericUtility.getValidDateString(rs.get(itr).get(0).toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
Timestamp time = new Timestamp(date.getTime()); Timestamp time = new Timestamp(date.getTime());
traceData.add(time); traceData.add(time);
traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1)); traceData.add(rs.get(itr).get(1) == null ? "" : rs.get(itr).get(1));
...@@ -1056,20 +1060,20 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1056,20 +1060,20 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
amount = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString()); amount = rs.get(itr).get(5) == null ? 0.0 : Double.parseDouble(rs.get(itr).get(5).toString());
} }
} }
/*if ( arrayListData.size() % 2 > 0) { //if ( arrayListData.size() % 2 > 0) {
System.out.print(" 4:[ ]"); // System.out.print(" 4:[ ]");
System.out.print(" 5:[ ]"); // System.out.print(" 5:[ ]");
System.out.print(" 6:["+siteCode+"]"); // System.out.print(" 6:["+siteCode+"]");
System.out.print(" 7:[ ]"); // System.out.print(" 7:[ ]");
System.out.print(" 8:["+amount+"]"); // System.out.print(" 8:["+amount+"]");
traceData.add(""); // traceData.add("");
traceData.add(""); // traceData.add("");
traceData.add(siteCode); // traceData.add(siteCode);
traceData.add(""); // traceData.add("");
traceData.add(amount); // traceData.add(amount);
//
arrayListData.add(traceData); // arrayListData.add(traceData);
}*/ //}
} }
traceData = null; traceData = null;
rs = null; rs = null;
...@@ -1085,6 +1089,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1085,6 +1089,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
} }
return arrayListData; return arrayListData;
} }
*/
private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> issueSiteMap,HashMap<String,Double> reseiverSiteMap,String siteCodeFr,String siteCodeTo,String rType,HashMap<String,String> issueSiteRefMap,HashMap<String,String> reseiverSiteRefMap) throws Exception private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> issueSiteMap,HashMap<String,Double> reseiverSiteMap,String siteCodeFr,String siteCodeTo,String rType,HashMap<String,String> issueSiteRefMap,HashMap<String,String> reseiverSiteRefMap) throws Exception
{ {
System.out.println("In buildTraceDataHM"); System.out.println("In buildTraceDataHM");
...@@ -1097,6 +1102,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1097,6 +1102,7 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
String key = "",firstRefSer = "",secondRefSer = ""; String key = "",firstRefSer = "",secondRefSer = "";
double firstSite = 0,secondSite = 0; double firstSite = 0,secondSite = 0;
int leftcnt = 0, rightcnt = 0; int leftcnt = 0, rightcnt = 0;
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
try { try {
ArrayList traceData = null; ArrayList traceData = null;
if ( issueSiteMap != null && reseiverSiteMap != null && issueSiteMap.size() > 0 && reseiverSiteMap.size() > 0 ) if ( issueSiteMap != null && reseiverSiteMap != null && issueSiteMap.size() > 0 && reseiverSiteMap.size() > 0 )
...@@ -1124,7 +1130,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1124,7 +1130,9 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
System.out.println("Ala re ala"); System.out.println("Ala re ala");
traceData = null; traceData = null;
traceData = new ArrayList<String>(); traceData = new ArrayList<String>();
java.util.Date date = new java.util.Date(keyArray[2].toString()); //java.util.Date date = new java.util.Date(keyArray[2].toString());
Date date = sdf.parse(keyArray[2].toString());
Timestamp time = new Timestamp(date.getTime()); Timestamp time = new Timestamp(date.getTime());
traceData.add(time); traceData.add(time);
traceData.add(firstRefSer); traceData.add(firstRefSer);
...@@ -1158,7 +1166,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1158,7 +1166,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
System.out.println("AAAAA:leftcnt["+leftcnt+"],rightcnt["+rightcnt+"],firstSite["+firstSite+"]"); System.out.println("AAAAA:leftcnt["+leftcnt+"],rightcnt["+rightcnt+"],firstSite["+firstSite+"]");
traceData = null; traceData = null;
traceData = new ArrayList<String>(); traceData = new ArrayList<String>();
java.util.Date date = new java.util.Date(issuesList.get(leftcnt).get(2).toString()); //java.util.Date date = new java.util.Date(issuesList.get(leftcnt).get(2).toString());
java.util.Date date = sdf.parse(issuesList.get(leftcnt).get(2).toString());
Timestamp time = new Timestamp(date.getTime()); Timestamp time = new Timestamp(date.getTime());
traceData.add(time); traceData.add(time);
traceData.add(issuesList.get(leftcnt).get(4).toString()); traceData.add(issuesList.get(leftcnt).get(4).toString());
...@@ -1183,7 +1192,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1183,7 +1192,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
System.out.println("BBBBB:leftcnt["+leftcnt+"],rightcnt["+rightcnt+"],secondSite["+secondSite+"]"); System.out.println("BBBBB:leftcnt["+leftcnt+"],rightcnt["+rightcnt+"],secondSite["+secondSite+"]");
traceData = null; traceData = null;
traceData = new ArrayList<String>(); traceData = new ArrayList<String>();
java.util.Date date = new java.util.Date(issuesList.get(leftcnt).get(2).toString()); //java.util.Date date = new java.util.Date(issuesList.get(leftcnt).get(2).toString());
java.util.Date date = sdf.parse(issuesList.get(leftcnt).get(2).toString());
Timestamp time = new Timestamp(date.getTime()); Timestamp time = new Timestamp(date.getTime());
traceData.add(time); traceData.add(time);
traceData.add(issuesList.get(leftcnt).get(4).toString()); traceData.add(issuesList.get(leftcnt).get(4).toString());
...@@ -1206,7 +1216,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci ...@@ -1206,7 +1216,8 @@ public class InterCompReconcile extends ValidatorEJB implements InterCompReconci
System.out.println("CCCCC:leftcnt["+leftcnt+"],rightcnt["+rightcnt+"],firstSite["+firstSite+"]"); System.out.println("CCCCC:leftcnt["+leftcnt+"],rightcnt["+rightcnt+"],firstSite["+firstSite+"]");
traceData = null; traceData = null;
traceData = new ArrayList<String>(); traceData = new ArrayList<String>();
java.util.Date date = new java.util.Date(issuesList.get(leftcnt).get(2).toString()); //java.util.Date date = new java.util.Date(issuesList.get(leftcnt).get(2).toString());
java.util.Date date = sdf.parse(issuesList.get(leftcnt).get(2).toString());
Timestamp time = new Timestamp(date.getTime()); Timestamp time = new Timestamp(date.getTime());
traceData.add(time); traceData.add(time);
traceData.add(issuesList.get(leftcnt).get(4).toString()); traceData.add(issuesList.get(leftcnt).get(4).toString());
......
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ 80d4a681
...@@ -3,7 +3,7 @@ package ibase.webitm.ejb.fin; ...@@ -3,7 +3,7 @@ package ibase.webitm.ejb.fin;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -29,6 +29,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -29,6 +29,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
FinCommon finCommon = null; FinCommon finCommon = null;
DistCommon disCommon = null; DistCommon disCommon = null;
ValidatorEJB validator = null; ValidatorEJB validator = null;
UtilMethods utilMethods = UtilMethods.getInstance();
public String wfValData(String xmlString, String xmlString1, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException public String wfValData(String xmlString, String xmlString1, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException
{ {
...@@ -566,7 +567,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -566,7 +567,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
Sdays = "0"; Sdays = "0";
} }
Idays = Integer.parseInt(Sdays); Idays = Integer.parseInt(Sdays);
effDate.setDate(effDate.getDate() + Idays); //effDate.setDate(effDate.getDate() + Idays);
effDate = utilMethods.RelativeDate(effDate, Idays);
if (effDate.before(refDate)) if (effDate.before(refDate))
{ {
errCode = "VTDATEEFF5~t" + Idays + "Days"; errCode = "VTDATEEFF5~t" + Idays + "Days";
...@@ -587,7 +589,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -587,7 +589,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
Idays = Integer.parseInt(Sdays); Idays = Integer.parseInt(Sdays);
if ((!rcpMode.equals("Q")) && (!rcpMode.equals("D"))) if ((!rcpMode.equals("Q")) && (!rcpMode.equals("D")))
continue; continue;
effDate.setDate(effDate.getDate() + Idays); //effDate.setDate(effDate.getDate() + Idays);
effDate = utilMethods.RelativeDate(effDate, Idays);
if (!effDate.before(refDate)) if (!effDate.before(refDate))
continue; continue;
errCode = "VTDATEEFF6~t" + Idays + "Days"; errCode = "VTDATEEFF6~t" + Idays + "Days";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment