Merge branch 'xggsve-invoice' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-invoice

xggsve-invoice/app/base/db/impl/invoice/iinvoicedeliverDao.js

@@ -47,7 +47,9 @@ class IinvoicedeliverDao extends Dao {
     sql.push("t1.businessmen_mobile, t1.businessmen_bank, t1.businessmen_account,");
     sql.push("t1.merchant_name, t1.merchant_credit_code, t1.merchant_addr,");
     sql.push("t1.merchant_mobile, t1.merchant_bank, t1.merchant_account,");
-    sql.push("t1.`created_at`, t1.`status`, t1.red_status");
+    sql.push("t1.`created_at`, t1.`status`, t1.red_status,");
+    sql.push("t2.`deliver_name`, t2.deliver_delive, t2.deliver_mail_no, t2.deliver_img,");
+    sql.push("t2.`operator_id`");
     sql.push("FROM i_invoice_deliver t2");
     sql.push("INNER JOIN i_invoice t1 on t1.id = t2.invoice_id");
     sql.push("WHERE 1 = 1 ");
@@ -86,11 +88,17 @@ class IinvoicedeliverDao extends Dao {
     if (params.invoiceTimeEnd) {
       sql.push("AND t1.`invoice_time` <= :invoiceTimeEnd");
     }
+    if (params.createTimeBegin) {
+      sql.push("AND t1.`created_at` >= :createTimeBegin");
+    }
+    if (params.createTimeEnd) {
+      sql.push("AND t1.`created_at` <= :createTimeEnd");
+    }
     if (params.red_status) {
       sql.push("AND t1.`red_status` = :red_status");
     }
     if (params.deliver_id) {
-      sql.push("AND t1.`deliver_id` = :deliver_id");
+      sql.push("AND t2.`deliver_id` = :deliver_id");
     }
     if (params.bd_id) {
       sql.push("AND t1.`bd_id` = :bd_id");
@@ -99,10 +107,15 @@ class IinvoicedeliverDao extends Dao {
       params.bd_path_like = params.bd_path + "%";
       sql.push("AND t1.`bd_path` = :bd_path_like");
     }
-
+    if (params.assigned) {
+      sql.push("AND t2.`operator_id` <> '' AND t2.`operator_id` IS NOT NULL ");
+    }
     if (params.operator_id) {
       sql.push("AND t2.`operator_id` = :operator_id");
     }
+    if (params.operator_path_like) {
+      sql.push("AND t2.`operator_path` = :operator_path_like");
+    }
   }
 
   /**

xggsve-invoice/app/base/service/impl/invoice/iinvoicedeliverSve.js

@@ -24,6 +24,9 @@ class IinvoicedeliverService extends ServiceBase {
     params.startRow = Number((params.currentPage - 1) * params.pageSize);
 
     let deliver_id = params.deliver_id;
+    if (!deliver_id) {
+      return system.getResult({count: 0, rows: []});
+    }
 
     let total = await this.dao.countByParams(params);
     if (total == 0) {