Commit dd264e7e authored by msharma's avatar msharma

Excluded Timestamp during if condition


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94470 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 16f8286a
......@@ -100,7 +100,7 @@ public class PhysicalCountSchedule implements Schedule
}
// added by ritesh on 28/02/14 START
int cnt= 0;
sql = " select COUNT(*) from users where name = TRIM('SYSTEM') ";
sql = " select COUNT(*) from users where CODE = 'SYSTEM' ";
pstmt=conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
......@@ -365,40 +365,69 @@ public class PhysicalCountSchedule implements Schedule
System.out.println("Half Year Period Defined");
System.out.println(from1Half+"----"+to1Half);
System.out.println(from2Half+"----"+to2Half);
System.out.println("dt----"+dt.toString()+"---");
System.out.println("from1Quarter.toString()----"+from1Quarter.toString()+"---");
System.out.println("to1Quarter.toString()----"+to1Quarter.toString()+"---");
System.out.println("from2Quarter.toString()----"+from2Quarter.toString()+"---");
System.out.println("to2Quarter.toString()----"+to2Quarter.toString()+"---");
System.out.println("from3Quarter.toString()----"+from3Quarter.toString()+"---");
System.out.println("to3Quarter.toString()----"+to3Quarter.toString()+"---");
System.out.println("from4Quarter.toString()----"+from4Quarter.toString()+"---");
System.out.println("to4Quarter.toString()----"+to4Quarter.toString()+"---");
if((dt.after(from1Quarter) || dt.toString().equals(from1Quarter.toString()) ) && (dt.before(to1Quarter) || dt.toString().equals(to1Quarter.toString()))) //change done by kunal on 31/12/12 add equal cond. as per manoj instruction
System.out.println("from1Half.toString()----"+from1Half.toString()+"---");
System.out.println("to1Half.toString()----"+to1Half.toString()+"---");
System.out.println("from2Half.toString()----"+from2Half.toString()+"---");
System.out.println("to2Half.toString()----"+to2Half.toString()+"---");
//System.out.println("dts----"+dts.after(from4Quarter));
//System.out.println("dts----"+dts.before(java.sql.Timestamp.valueOf(sdf1.format(to4Quarter).toString() + " 00:00:00.0"))+"----"+dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to4Quarter).toString() + " 00:00:00.0")));
//Excluded Timestamp during if condition by Manoj dtd 01/04/2014
//if((dt.after(from1Quarter) || dt.toString().equals(from1Quarter.toString()) ) && (dt.before(to1Quarter) || dt.toString().equals(to1Quarter.toString()))) //change done by kunal on 31/12/12 add equal cond. as per manoj instruction
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Quarter).toString() + " 00:00:00.0")) || dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Quarter).toString() + " 00:00:00.0"))) && (dts.before(java.sql.Timestamp.valueOf(sdf1.format(to1Quarter).toString() + " 00:00:00.0")) || dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to1Quarter).toString() + " 00:00:00.0")) ) )
{
//subSql=" AND TRAN_DATE BETWEEN ";
setQFromdt=from1Quarter;
setQTodt=to1Quarter;
}
if((dt.after(from2Quarter) || dt.toString().equals(from2Quarter.toString())) && (dt.before(to2Quarter) || dt.toString().equals(to2Quarter.toString())))
//if((dt.after(from2Quarter) || dt.toString().equals(from2Quarter.toString())) && (dt.before(to2Quarter) || dt.toString().equals(to2Quarter.toString())))
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from2Quarter).toString() + " 00:00:00.0")) || dts.after(java.sql.Timestamp.valueOf(sdf1.format(from2Quarter).toString() + " 00:00:00.0"))) && (dts.before(java.sql.Timestamp.valueOf(sdf1.format(to2Quarter).toString() + " 00:00:00.0")) || dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to2Quarter).toString() + " 00:00:00.0")) ) )
{
setQFromdt=from2Quarter;
setQTodt=to2Quarter;
}
if((dt.after(from3Quarter)|| dt.toString().equals(from3Quarter.toString()) ) && ( dt.before(to3Quarter) || dt.toString().equals(to3Quarter.toString())))
//if((dt.after(from3Quarter)|| dt.toString().equals(from3Quarter.toString()) ) && ( dt.before(to3Quarter) || dt.toString().equals(to3Quarter.toString())))
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from3Quarter).toString() + " 00:00:00.0")) || dts.after(java.sql.Timestamp.valueOf(sdf1.format(from3Quarter).toString() + " 00:00:00.0"))) && (dts.before(java.sql.Timestamp.valueOf(sdf1.format(to3Quarter).toString() + " 00:00:00.0")) || dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to3Quarter).toString() + " 00:00:00.0")) ) )
{
setQFromdt=from3Quarter;
setQTodt=to3Quarter;
}
if((dt.after(from4Quarter) || dt.toString().equals(from4Quarter.toString())) && ( dt.before(to4Quarter) || dt.toString().equals(to4Quarter.toString())))
//if((dt.after(from4Quarter) || dt.toString().equals(from4Quarter.toString())) && ( dt.before(to4Quarter) || dt.toString().equals(to4Quarter.toString())))
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from4Quarter).toString() + " 00:00:00.0")) || dts.after(java.sql.Timestamp.valueOf(sdf1.format(from4Quarter).toString() + " 00:00:00.0"))) && (dts.before(java.sql.Timestamp.valueOf(sdf1.format(to4Quarter).toString() + " 00:00:00.0")) || dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to4Quarter).toString() + " 00:00:00.0")) ) )
{
setQFromdt=from4Quarter;
setQTodt=to4Quarter;
}
if((dt.after(from1Half) || dt.toString().equals(from1Half.toString())) && (dt.before(to1Half) || dt.toString().equals(to1Half.toString())))
//if((dt.after(from1Half) || dt.toString().equals(from1Half.toString())) && (dt.before(to1Half) || dt.toString().equals(to1Half.toString())))
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Half).toString() + " 00:00:00.0")) || dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Half).toString() + " 00:00:00.0"))) && (dts.before(java.sql.Timestamp.valueOf(sdf1.format(to1Half).toString() + " 00:00:00.0")) || dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to1Half).toString() + " 00:00:00.0")) ) )
{
setHFromdt=from1Half;
setHTodt=to1Half;
}
if((dt.after(from2Half) || dt.toString().equals(from2Half.toString())) && (dt.before(to2Half) || dt.toString().equals(to2Half.toString())))
//if((dt.after(from2Half) || dt.toString().equals(from2Half.toString())) && (dt.before(to2Half) || dt.toString().equals(to2Half.toString())))
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from2Half).toString() + " 00:00:00.0")) || dts.after(java.sql.Timestamp.valueOf(sdf1.format(from2Half).toString() + " 00:00:00.0"))) && (dts.before(java.sql.Timestamp.valueOf(sdf1.format(to2Half).toString() + " 00:00:00.0")) || dts.equals(java.sql.Timestamp.valueOf(sdf1.format(to2Half).toString() + " 00:00:00.0")) ) )
{
setHFromdt=from2Half;
setHTodt=to2Half;
......
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