张康康：开票订单行选择查询调整

src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/Tinvoiceapply.java

@@ -236,22 +236,21 @@ public class Tinvoiceapply extends Controller {
         SQLFactory factory = new SQLFactory(this, "¿ªÆ±¶©µ¥ÐÐÑ¡Ôñ²éѯ");
         factory.addParameter("siteid", siteid);
         factory.addParameter("fagentnum", fagentnum);
-        if(!"".equals(fbegdate)){
-            String wherestr1 = " and sdate.closedate1 >='"+fbegdate+"' and sdate.closedate1 <='"+fenddate+"'";
+        if(!"".equals(fbegdate) && !"".equals(fenddate)){
+            String wherestr1 = " sdate.closedate1 >='"+fbegdate+"' and sdate.closedate1 <='"+fenddate+"'";
             factory.addParameter_SQL("where1", wherestr1);
         }else{
-            factory.addParameter_SQL("where1", "");
+            factory.addParameter_SQL("where1", "1=1");
         }
-        if(!"".equals(fbegdate)){
-            String wherestr2 = " and tp.fprojectname like '%"+fprojectname+"%'";
+        if(!"".equals(fprojectname)){
+            String wherestr2 = " tp.fprojectname like '%"+fprojectname+"%'";
             factory.addParameter_SQL("where2", wherestr2);
         }else{
-            factory.addParameter_SQL("where2", "");
+            factory.addParameter_SQL("where2", "1=1");
         }
 
         //factory.addParameter("finvoicetaxnumber", finvoicetaxnumber);
         factory.addParameter("tinvoiceapplyid", tinvoiceapplyid);
-        System.out.println("factory.getSQL()==="+factory.getSQL());
 
         DBConnect connect = new DBConnect();
         Rows rows = connect.runSqlQuery(factory.getSQL());

src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/Tinvoiceapply_saler.java

@@ -267,22 +267,21 @@ public class Tinvoiceapply_saler extends Controller {
         SQLFactory factory = new SQLFactory(this, "¿ªÆ±¶©µ¥ÐÐÑ¡Ôñ²éѯ");
         factory.addParameter("siteid", siteid);
         factory.addParameter("fagentnum", fagentnum);
-        if(!"".equals(fbegdate)){
+        if(!"".equals(fbegdate) && !"".equals(fenddate)){
             String wherestr1 = " and sdate.closedate1 >='"+fbegdate+"' and sdate.closedate1 <='"+fenddate+"'";
             factory.addParameter_SQL("where1", wherestr1);
         }else{
-            factory.addParameter_SQL("where1", "");
+            factory.addParameter_SQL("where1", "1=1");
         }
-        if(!"".equals(fbegdate)){
+        if(!"".equals(fprojectname)){
             String wherestr2 = " and tp.fprojectname like '%"+fprojectname+"%'";
             factory.addParameter_SQL("where2", wherestr2);
         }else{
-            factory.addParameter_SQL("where2", "");
+            factory.addParameter_SQL("where2", "1=1");
         }
 
         //factory.addParameter("finvoicetaxnumber", finvoicetaxnumber);
         factory.addParameter("tinvoiceapplyid", tinvoiceapplyid);
-        System.out.println("factory.getSQL()==="+factory.getSQL());
 
         DBConnect connect = new DBConnect();
         Rows rows = connect.runSqlQuery(factory.getSQL());