fix: 列表显示 数据 错误

tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js

@@ -44,18 +44,35 @@ class DeliverybillDao extends Dao {
         filters.push({
         filters.push({
           delivery_status: {
           delivery_status: {
             $in: [
             $in: [
-              system.SERVERSESTATUS.INSERVICE, system.SERVERSESTATUS.CLOSED, system.SERVERSESTATUS.SUCCESS
+              system.SERVERSESTATUS.CLOSED, system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.INSERVICE,
             ]
             ]
-          }
+          },
         });
         });
         break
         break
       case "/deliveryManage/deliveryDealWith":  //交付单处理
       case "/deliveryManage/deliveryDealWith":  //交付单处理
         filters.push({
         filters.push({
-          delivery_status: {
-            $in: [
-              system.SERVERSESTATUS.RECEIVED, system.SERVERSESTATUS.WAITUSERCONFIRM, system.SERVERSESTATUS.INSERVICE
+          $or: [{
+            delivery_status: {
+              $in: [
+                system.SERVERSESTATUS.RECEIVED, system.SERVERSESTATUS.WAITUSERCONFIRM
+              ]
+            }
+          },
+          {
+            delivery_status: system.SERVERSESTATUS.INSERVICE,
+            $or: [
+              {
+                v_setup_status: system.SERVERSESTATUS.NOTSETUP
+              },
+              {
+                v_setup_status: {
+                  $eq: null
+                }
+              }
             ]
             ]
           }
           }
+          ],
+
         });
         });
         break
         break
     }
     }
@@ -138,17 +155,17 @@ class DeliverybillDao extends Dao {
   async updateServer(qobj, t) {
   async updateServer(qobj, t) {
     var setobj = { "delivery_info": qobj.delivery_info };
     var setobj = { "delivery_info": qobj.delivery_info };
     var whereobj = { "biz_id": qobj.biz_id };
     var whereobj = { "biz_id": qobj.biz_id };
-    if (qobj.delivery_code && qobj.delivery_code != 'undefined'){
-      whereobj.delivery_code =  qobj.delivery_code; 
-    } 
+    if (qobj.delivery_code && qobj.delivery_code != 'undefined') {
+      whereobj.delivery_code = qobj.delivery_code;
+    }
     return await this.updateByWhere(setobj, whereobj, t);
     return await this.updateByWhere(setobj, whereobj, t);
   }
   }
 
 
   async findOneByDeliveryCodeAndBizId(qobj) {
   async findOneByDeliveryCodeAndBizId(qobj) {
     var qcwhere = { "biz_id": qobj.biz_id };
     var qcwhere = { "biz_id": qobj.biz_id };
-    if (qobj.delivery_code && qobj.delivery_code != 'undefined'){
-      qcwhere.delivery_code =  qobj.delivery_code; 
-    } 
+    if (qobj.delivery_code && qobj.delivery_code != 'undefined') {
+      qcwhere.delivery_code = qobj.delivery_code;
+    }
     return await this.findOne(qcwhere);
     return await this.findOne(qcwhere);
   }
   }
   /**
   /**