gsb

xggsve-order/app/base/db/impl/order/obusinessmenDao.js

@@ -38,38 +38,46 @@ class ObusinessmenDao extends Dao {
   }
   }
 
 
   setCondition(sql, params) {
   setCondition(sql, params) {
-    if(params.order_id) {
+    if (params.order_id) {
       sql.push("AND t1.order_id = :order_id");
       sql.push("AND t1.order_id = :order_id");
     }
     }
-    if(params.orderIds && params.orderIds.length > 0) {
+    if (params.orderIds && params.orderIds.length > 0) {
       sql.push("AND t1.order_id IN (:orderIds)");
       sql.push("AND t1.order_id IN (:orderIds)");
     }
     }
-    if(params.name) {
+    if (params.name) {
       params.name_like = "%" + params.name + "%";
       params.name_like = "%" + params.name + "%";
       sql.push("AND t1.name LIKE :name_like");
       sql.push("AND t1.name LIKE :name_like");
     }
     }
-    if(params.bd_id) {
+    if (params.bd_id) {
       sql.push("AND t1.bd_id = :bd_id");
       sql.push("AND t1.bd_id = :bd_id");
     }
     }
-    if(params.bd_path) {
+    if (params.bd_path) {
       params.bd_path_like = params.bd_path + "%";
       params.bd_path_like = params.bd_path + "%";
       sql.push("AND t1.bd_path LIKE :bd_path_like");
       sql.push("AND t1.bd_path LIKE :bd_path_like");
     }
     }
-    if(params.order_id) {
+    if (params.order_id) {
       sql.push("AND t1.order_id = :order_id");
       sql.push("AND t1.order_id = :order_id");
     }
     }
-    if(params.legal_name) {
+    if (params.legal_name) {
       sql.push("AND t1.legal_name = :legal_name");
       sql.push("AND t1.legal_name = :legal_name");
     }
     }
-    if(params.legal_mobile) {
+    if (params.legal_mobile) {
       sql.push("AND t1.legal_mobile = :legal_mobile");
       sql.push("AND t1.legal_mobile = :legal_mobile");
     }
     }
-    if(params.legal_idcard) {
+    if (params.legal_idcard) {
       sql.push("AND t1.legal_idcard = :legal_idcard");
       sql.push("AND t1.legal_idcard = :legal_idcard");
     }
     }
-    if(params.credit_code) {
+    if (params.credit_code) {
       sql.push("AND t1.credit_code = :credit_code");
       sql.push("AND t1.credit_code = :credit_code");
     }
     }
+
+    if (params.hasOwnProperty("isSign")) {
+      if (params.isSign) {
+        sql.push("AND t1.sign_time IS NOT NULL");
+      } else {
+        sql.push("AND t1.sign_time IS NULL");
+      }
+    }
   }
   }
 }
 }
 
 

xggsve-order/app/base/db/impl/order/oorderdeliverDao.js

@@ -49,7 +49,7 @@ class OorderdeliverDao extends Dao {
       return [];
       return [];
     }
     }
     let sql =  `SELECT * FROM o_order_deliver WHERE deliver_id in (:deliverIdList)`;
     let sql =  `SELECT * FROM o_order_deliver WHERE deliver_id in (:deliverIdList)`;
-    return await this.customQuery(sql.join(" "), {deliverIdList: ids});
+    return await this.customQuery(sql, {deliverIdList: ids});
   }
   }
 
 
   async mapByIds(params) {
   async mapByIds(params) {