Commit fe5a46d5 authored by msharma's avatar msharma

Excluded Timestamp during if condition


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94474 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 52603837
...@@ -387,29 +387,38 @@ public class PhysicalCountSchedule implements Schedule ...@@ -387,29 +387,38 @@ public class PhysicalCountSchedule implements Schedule
//Excluded Timestamp during if condition by Manoj dtd 01/04/2014 //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((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")) ) ) System.out.println(dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Quarter).toString() + " 00:00:00.0")) +"-----"+ dts.equals(java.sql.Timestamp.valueOf(sdf1.format(from1Quarter).toString() + " 00:00:00.0"))) ;
//System.out.println(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"))) ;
//System.out.println(dts.after(java.sql.Timestamp.valueOf(sdf1.format(from4Quarter).toString() + " 00:00:00.0")) +"-----"+ dts.equals(java.sql.Timestamp.valueOf(sdf1.format(from4Quarter).toString() + " 00:00:00.0"))) ;
//System.out.println(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"))) ;
if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Quarter).toString() + " 00:00:00.0")) || dts.equals(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 "; //subSql=" AND TRAN_DATE BETWEEN ";
setQFromdt=from1Quarter; setQFromdt=from1Quarter;
setQTodt=to1Quarter; setQTodt=to1Quarter;
System.out.println("----1----");
} }
//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")) ) ) if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from2Quarter).toString() + " 00:00:00.0")) || dts.equals(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; setQFromdt=from2Quarter;
setQTodt=to2Quarter; setQTodt=to2Quarter;
System.out.println("----2----");
} }
//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")) ) ) if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from3Quarter).toString() + " 00:00:00.0")) || dts.equals(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; setQFromdt=from3Quarter;
setQTodt=to3Quarter; setQTodt=to3Quarter;
System.out.println("----3----");
} }
//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())))
...@@ -417,21 +426,22 @@ public class PhysicalCountSchedule implements Schedule ...@@ -417,21 +426,22 @@ public class PhysicalCountSchedule implements Schedule
{ {
setQFromdt=from4Quarter; setQFromdt=from4Quarter;
setQTodt=to4Quarter; setQTodt=to4Quarter;
System.out.println("----4----");
} }
//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")) ) ) if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from1Half).toString() + " 00:00:00.0")) || dts.equals(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; setHFromdt=from1Half;
setHTodt=to1Half; setHTodt=to1Half;
System.out.println("----5----");
} }
//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")) ) ) if((dts.after(java.sql.Timestamp.valueOf(sdf1.format(from2Half).toString() + " 00:00:00.0")) || dts.equals(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; setHFromdt=from2Half;
setHTodt=to2Half; setHTodt=to2Half;
System.out.println("----6----");
} }
queryString="select count(1) from PHYSCAN where tran_date=? and tran_type='A' and site_code=?"; queryString="select count(1) from PHYSCAN where tran_date=? and tran_type='A' and site_code=?";
......
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