1

REBORN.Repository/Dmc/Rb_supplierRepository.cs

@@ -39,44 +39,44 @@ namespace REBORN.Repository.Dmc
 
             string selectFiled = "";
             string typeWhere = "";//2025-08-27 add by:W
-            switch (hmodel.Type)
-            {
-                case Common.Enum.ResourceTypeEnum.Hotel:
-                    selectFiled = ",IFNULL(B.Number,0) AS Number ";
-                    joinTable = @"
-LEFT JOIN 
-(
-    SELECT Supplier,count(1) AS Number FROM rb_hotel_price WHERE Status=0 AND Date>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00')  GROUP BY Supplier
-) AS B ON A.ID=B.Supplier
- ";
-                    break;
-                case Common.Enum.ResourceTypeEnum.Dining:
-                    selectFiled = ",0 AS Number ";
+//            switch (hmodel.Type)
+//            {
+//                case Common.Enum.ResourceTypeEnum.Hotel:
+//                    selectFiled = ",IFNULL(B.Number,0) AS Number ";
+//                    joinTable = @"
+//LEFT JOIN 
+//(
+//    SELECT Supplier,count(1) AS Number FROM rb_hotel_price WHERE Status=0 AND Date>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00')  GROUP BY Supplier
+//) AS B ON A.ID=B.Supplier
+// ";
+//                    break;
+//                case Common.Enum.ResourceTypeEnum.Dining:
+//                    selectFiled = ",0 AS Number ";
 
-                    //selectFiled = ",IFNULL(B.Number,0) AS Number ";
-                    //                    joinTable = @" 
-                    //LEFT JOIN 
-                    //(
-                    //    SELECT Supplier,count(1) AS Number FROM rb_dining_price WHERE Status=0 AND Date>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00')  GROUP BY Supplier 
-                    //) AS B ON A.ID=B.Supplier ";
-                    break;
-                case Common.Enum.ResourceTypeEnum.TicketCoupons:
-                    selectFiled = ",IFNULL(B.Number,0) AS Number ";
-                    joinTable = @" 
-LEFT JOIN ( 
-SELECT Supplier,count(1) AS Number FROM rb_ticketcoupons_price WHERE Status=0 AND Date>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00')  GROUP BY Supplier
-) AS B ON A.ID=B.Supplier ";
-                    break;
-                case Common.Enum.ResourceTypeEnum.Vehicle:
-                    selectFiled = ",IFNULL(B.Number,0) AS Number ";
-                    joinTable = @"
-LEFT JOIN ( 
-SELECT SupplierId AS Supplier,count(1) AS Number FROM rb_bus  WHERE  Status=0 AND StartDate>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00') GROUP BY SupplierId 
-) AS B ON A.ID=B.Supplier 
-";
-                    break;
+//                    //selectFiled = ",IFNULL(B.Number,0) AS Number ";
+//                    //                    joinTable = @" 
+//                    //LEFT JOIN 
+//                    //(
+//                    //    SELECT Supplier,count(1) AS Number FROM rb_dining_price WHERE Status=0 AND Date>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00')  GROUP BY Supplier 
+//                    //) AS B ON A.ID=B.Supplier ";
+//                    break;
+//                case Common.Enum.ResourceTypeEnum.TicketCoupons:
+//                    selectFiled = ",IFNULL(B.Number,0) AS Number ";
+//                    joinTable = @" 
+//LEFT JOIN ( 
+//SELECT Supplier,count(1) AS Number FROM rb_ticketcoupons_price WHERE Status=0 AND Date>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00')  GROUP BY Supplier
+//) AS B ON A.ID=B.Supplier ";
+//                    break;
+//                case Common.Enum.ResourceTypeEnum.Vehicle:
+//                    selectFiled = ",IFNULL(B.Number,0) AS Number ";
+//                    joinTable = @"
+//LEFT JOIN ( 
+//SELECT SupplierId AS Supplier,count(1) AS Number FROM rb_bus  WHERE  Status=0 AND StartDate>=CONCAT(SUBSTR(now(), 1,10),' 00:00:00') GROUP BY SupplierId 
+//) AS B ON A.ID=B.Supplier 
+//";
+//                    break;
 
-            }
+//            }
             if (hmodel.Type > 0)
             {
                 typeWhere = " LEFT JOIN rb_supplier_type as st on a.ID=st.SupplierId ";
@@ -90,7 +90,7 @@ SELECT SupplierId AS Supplier,count(1) AS Number FROM rb_bus  WHERE  Status=0 AN
             sb.AppendFormat(" AND A.{0}={1}", nameof(RB_Supplier_Extend.RB_Group_id), hmodel.RB_Group_id.Value);
             if (hmodel.Type > 0)
             {
-                sb.AppendFormat(" AND st.{0}={1}", nameof(RB_Supplier_Type.Type), (int)hmodel.Type);
+                sb.AppendFormat(" AND st.{0}={1} and st.status=0 ", nameof(RB_Supplier_Type.Type), (int)hmodel.Type);
             }
             if (hmodel.Name != null && !string.IsNullOrWhiteSpace(hmodel.Name.Trim()))
             {