bug修复

src/custom/restcontroller/webmanage/sale/databoard/databoard.java

@@ -87,22 +87,22 @@ public class databoard extends Controller {
         StringBuffer whereLast1 = new StringBuffer(" 1=1 and t1.sys_enterpriseid=" + sys_enterpriseid);
         StringBuffer whereLast2 = new StringBuffer(" 1=1 and t1.sys_enterpriseid=" + sys_enterpriseid);
 
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(begindate).append("' ");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(enddate).append("' ");
         }
-        if (begindate1 != "") {
+        if (!begindate1.equals("")) {
             whereLast1.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(begindate1).append("' ");
         }
-        if (enddate1 != "") {
+        if (!enddate1.equals("")) {
             whereLast1.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(enddate1).append("' ");
         }
-        if (begindate2 != "") {
+        if (!begindate2.equals("")) {
             whereLast2.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >='").append(begindate2).append("' ");
         }
-        if (enddate2 != "") {
+        if (!enddate2.equals("")) {
             whereLast2.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(enddate2).append("' ");
         }
 
@@ -215,7 +215,7 @@ public class databoard extends Controller {
         StringBuffer whereLastYear = new StringBuffer(" 1=1 ");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and t1.checkdate >='").append(begindate).append(" 00:00:00'");
             Date date = sdf.parse(begindate);
             //创建Calendar实例
@@ -226,7 +226,7 @@ public class databoard extends Controller {
             cal.add(Calendar.YEAR, -1);
             whereLastYear.append(" and t1.checkdate >='").append(sdf.format(cal.getTime())).append(" 00:00:00'");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and t1.checkdate <='").append(enddate).append(" 23:59:59'");
             Date date = sdf.parse(enddate);
             //创建Calendar实例
@@ -431,10 +431,10 @@ public class databoard extends Controller {
         }
 
         StringBuffer where = new StringBuffer(" 1=1 ");
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(begindate).append("' ");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(enddate).append("' ");
         }
 
@@ -502,7 +502,7 @@ public class databoard extends Controller {
         StringBuffer whereLastYear = new StringBuffer(" 1=1 ");
 
 
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(begindate).append("' ");
             Date date = sdf.parse(begindate);
             //创建Calendar实例
@@ -513,7 +513,7 @@ public class databoard extends Controller {
             cal.add(Calendar.YEAR, -1);
             whereLastYear.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(sdf.format(cal.getTime())).append("' ");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(enddate).append("' ");
             Date date = sdf.parse(enddate);
             //创建Calendar实例
@@ -636,10 +636,10 @@ public class databoard extends Controller {
                 enddate = whereObject.getString("enddate");
             }
         }
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and DATE_FORMAT(checkdate, '%Y-%m-%d') >='").append(begindate).append("' ");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and DATE_FORMAT(checkdate, '%Y-%m-%d') <='").append(enddate).append("' ");
         }
 
@@ -746,7 +746,7 @@ public class databoard extends Controller {
         StringBuffer whereLastYear = new StringBuffer(" 1=1 ");
 
 
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(begindate).append("' ");
             Date date = sdf.parse(begindate);
             //创建Calendar实例
@@ -757,7 +757,7 @@ public class databoard extends Controller {
             cal.add(Calendar.YEAR, -1);
             whereLastYear.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(sdf.format(cal.getTime())).append("' ");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(enddate).append("' ");
             Date date = sdf.parse(enddate);
             //创建Calendar实例
@@ -849,10 +849,10 @@ public class databoard extends Controller {
         }
 
         StringBuffer where = new StringBuffer(" 1=1 ");
-        if (begindate != "") {
+        if (!begindate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') >='").append(begindate).append("' ");
         }
-        if (enddate != "") {
+        if (!enddate.equals("")) {
             where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(enddate).append("' ");
         }
 

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -817,10 +817,10 @@ public class OrderItems extends Controller {
                             break;
                     }
                 }
-                if (begindate != "") {
+                if (!begindate.equals("")) {
                     where.append(" and DATE_FORMAT(t5.submitdate, '%Y-%m-%d') >='").append(begindate).append("' ");
                 }
-                if (enddate != "") {
+                if (!enddate.equals("")) {
                     where.append(" and DATE_FORMAT(t5.submitdate, '%Y-%m-%d') <='").append(enddate).append("' ");
                 }