|
@@ -1611,8 +1611,13 @@ namespace OTSIncAReportGrids
|
|
|
condition = "";
|
|
|
if (!string.IsNullOrWhiteSpace(tBx_AreaMin.Text))
|
|
|
{
|
|
|
- double num = 0;
|
|
|
- if (double.TryParse(tBx_AreaMin.Text, out num) && num > 0)
|
|
|
+ double dnum = 0;
|
|
|
+ int inum = 0;
|
|
|
+ if (double.TryParse(tBx_AreaMin.Text, out dnum) && dnum >= 0)
|
|
|
+ {
|
|
|
+ condition += " and Area" + " > " + tBx_AreaMin.Text;
|
|
|
+ }
|
|
|
+ else if(int.TryParse(tBx_AreaMin.Text, out inum) && inum >= 0)
|
|
|
{
|
|
|
condition += " and Area" + " > " + tBx_AreaMin.Text;
|
|
|
}
|
|
@@ -1625,8 +1630,13 @@ namespace OTSIncAReportGrids
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(Tbx_AreaMax.Text))
|
|
|
{
|
|
|
- double num = 0;
|
|
|
- if (double.TryParse(Tbx_AreaMax.Text, out num) && num > 0)
|
|
|
+ double dnum = 0;
|
|
|
+ int inum = 0;
|
|
|
+ if (double.TryParse(Tbx_AreaMax.Text, out dnum) && dnum >= 0)
|
|
|
+ {
|
|
|
+ condition += " and Area" + "<" + Tbx_AreaMax.Text;
|
|
|
+ }
|
|
|
+ else if (int.TryParse(Tbx_AreaMax.Text, out inum) && inum >= 0)
|
|
|
{
|
|
|
condition += " and Area" + "<" + Tbx_AreaMax.Text;
|
|
|
}
|
|
@@ -1639,8 +1649,13 @@ namespace OTSIncAReportGrids
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(tbx_DmaxMin.Text))
|
|
|
{
|
|
|
- double num = 0;
|
|
|
- if (double.TryParse(tbx_DmaxMin.Text, out num) && num > 0)
|
|
|
+ double dnum = 0;
|
|
|
+ int inum = 0;
|
|
|
+ if (double.TryParse(tbx_DmaxMin.Text, out dnum) && dnum >= 0)
|
|
|
+ {
|
|
|
+ condition += " and DMAX" + " > " + tbx_DmaxMin.Text;
|
|
|
+ }
|
|
|
+ else if(int.TryParse(tbx_DmaxMin.Text, out inum)&& inum >= 0)
|
|
|
{
|
|
|
condition += " and DMAX" + " > " + tbx_DmaxMin.Text;
|
|
|
}
|
|
@@ -1653,8 +1668,13 @@ namespace OTSIncAReportGrids
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(tbx_DmaxMax.Text))
|
|
|
{
|
|
|
- double num = 0;
|
|
|
- if (double.TryParse(tbx_DmaxMax.Text, out num) && num > 0)
|
|
|
+ double dnum = 0;
|
|
|
+ int inum = 0;
|
|
|
+ if (double.TryParse(tbx_DmaxMax.Text, out dnum) && dnum > 0)
|
|
|
+ {
|
|
|
+ condition += " and DMAX" + "<" + tbx_DmaxMax.Text;
|
|
|
+ }
|
|
|
+ else if(int.TryParse(tbx_DmaxMax.Text, out inum)&& inum >= 0)
|
|
|
{
|
|
|
condition += " and DMAX" + "<" + tbx_DmaxMax.Text;
|
|
|
}
|