Merge branch 'master' of http://dev.hsfuel.com:3000/wei.chen/SmartFuelTool

src/MS.Entities/AccountingService_Models/BusinessUnitInfo.cs

@@ -12,30 +12,30 @@ namespace MS.Entities.AccountingService_Models
     {
         public BusinessUnitInfo()
         {
-            AccountInfoBuInfoCreated = new HashSet<AccountInfo>();
-            AccountInfoBusinessUnitInfo = new HashSet<AccountInfo>();
-            BlackCardInfoBuInfo = new HashSet<BlackCardInfo>();
-            BlackCardInfoBuInfoCreated = new HashSet<BlackCardInfo>();
-            CardInfoBuInfoCreated = new HashSet<CardInfo>();
-            CardInfoBusinessUnitInfo = new HashSet<CardInfo>();
-            CardRepLossInfoBuInfo = new HashSet<CardRepLossInfo>();
-            CardRepLossInfoBuInfoCreated = new HashSet<CardRepLossInfo>();
-            GrayInfoBuInfo = new HashSet<GrayInfo>();
-            GrayInfoBuInfoCreated = new HashSet<GrayInfo>();
-            InverseBusinessUnitInfoNavigation = new HashSet<BusinessUnitInfo>();
-            InverseParentBu = new HashSet<BusinessUnitInfo>();
-            InvoiceInfoBuInfo = new HashSet<InvoiceInfo>();
-            InvoiceInfoBuInfoCreated = new HashSet<InvoiceInfo>();
-            MembershipGroupBuInfo = new HashSet<MembershipGroup>();
-            MembershipGroupBuInfoCreated = new HashSet<MembershipGroup>();
-            MembershipGrowthRulesBuInfo = new HashSet<MembershipGrowthRules>();
-            MembershipGrowthRulesBuInfoCreated = new HashSet<MembershipGrowthRules>();
-            MembershipLevelInfoBuInfo = new HashSet<MembershipLevelInfo>();
-            MembershipLevelInfoBuInfoCreated = new HashSet<MembershipLevelInfo>();
-            RechargePaymentHistory = new HashSet<RechargePaymentHistory>();
-            SmsInfoBuInfo = new HashSet<SmsInfo>();
-            SmsInfoBuInfoCreated = new HashSet<SmsInfo>();
-            UserInfo = new HashSet<UserInfo>();
+            //AccountInfoBuInfoCreated = new HashSet<AccountInfo>();
+            //AccountInfoBusinessUnitInfo = new HashSet<AccountInfo>();
+            //BlackCardInfoBuInfo = new HashSet<BlackCardInfo>();
+            //BlackCardInfoBuInfoCreated = new HashSet<BlackCardInfo>();
+            //CardInfoBuInfoCreated = new HashSet<CardInfo>();
+            //CardInfoBusinessUnitInfo = new HashSet<CardInfo>();
+            //CardRepLossInfoBuInfo = new HashSet<CardRepLossInfo>();
+            //CardRepLossInfoBuInfoCreated = new HashSet<CardRepLossInfo>();
+            //GrayInfoBuInfo = new HashSet<GrayInfo>();
+            //GrayInfoBuInfoCreated = new HashSet<GrayInfo>();
+            //InverseBusinessUnitInfoNavigation = new HashSet<BusinessUnitInfo>();
+            //InverseParentBu = new HashSet<BusinessUnitInfo>();
+            //InvoiceInfoBuInfo = new HashSet<InvoiceInfo>();
+            //InvoiceInfoBuInfoCreated = new HashSet<InvoiceInfo>();
+            //MembershipGroupBuInfo = new HashSet<MembershipGroup>();
+            //MembershipGroupBuInfoCreated = new HashSet<MembershipGroup>();
+            //MembershipGrowthRulesBuInfo = new HashSet<MembershipGrowthRules>();
+            //MembershipGrowthRulesBuInfoCreated = new HashSet<MembershipGrowthRules>();
+            //MembershipLevelInfoBuInfo = new HashSet<MembershipLevelInfo>();
+            //MembershipLevelInfoBuInfoCreated = new HashSet<MembershipLevelInfo>();
+            //RechargePaymentHistory = new HashSet<RechargePaymentHistory>();
+            //SmsInfoBuInfo = new HashSet<SmsInfo>();
+            //SmsInfoBuInfoCreated = new HashSet<SmsInfo>();
+            //UserInfo = new HashSet<UserInfo>();
         }
 
         public Guid Id { get; set; }

src/MS.Services/Account/AccountService.cs

@@ -1109,7 +1109,7 @@ SELECT subquery.belong_to,subquery.accountId, count(*) count from (SELECT trx.ac
         /// <exception cref="NotImplementedException"></exception>
         public async Task<IEnumerable<string>> GetBuids()
         {
-            var businessUnitInfos =await _AuthContext.GetRepository<BusinessUnitInfo>().GetAll()
+            var businessUnitInfos =await _AccountingContext.GetRepository<BusinessUnitInfo>().GetAll()
                 .Where(p => !p.BuName.Contains("集团")).Where(o => !o.BuName.Contains("公司")).ToListAsync();
             if (businessUnitInfos!=null&&businessUnitInfos.Any()) {
                 return businessUnitInfos.Select(p => p.Id.ToString()).ToList();

src/MS.WebApi/Controllers/ReportController.cs

@@ -135,7 +135,7 @@ namespace MS.WebApi.Controllers
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        [Route("ExportToExcel")]
+        [Route("BusinessScopeReportTimeJob")]
         [EnableCors("AllowSpecificOrigin")]
         [HttpGet]
         public async Task<object> BusinessScopeReportTimeJob(int type = 1,string time="",int pagesize=13)

src/MS.WebApi/appsettings.json

@@ -5,7 +5,7 @@
     "AccountingService": "Server=47.101.220.106;database=AccountingService_Sun_0230AMMon03180930AM;port=5432;User Id=postgres;Password=Postgres3141",
     "AuthServiceDatabase": "Server=47.101.220.106;database=AuthServiceDatabase_NewThu04130311PM;port=5432;User Id=postgres;Password=Postgres3141",
     "StockdbDatabase": "Server=47.101.220.106;user=root;database=stockdb;port=3307;password=Wayne@123;SslMode=None",
-    "WaynedbDatabase": "Server=47.101.220.106;user=root;database=waynedb;port=3307;password=Wayne@123;SslMode=None",
+    "WaynedbDatabase": "Server=47.101.220.106;user=root;database=waynedb;port=3307;password=Wayne@123;SslMode=None"
 
     //"MSDbContext": "Server=pgm-wz9hvfon1ng52i39194070.pg.rds.aliyuncs.com;database=TransactionServiceDatabase;port=5432;User Id=postgres;Password=Postgres3141",
     //"AccountingService": "Server=pgm-wz9hvfon1ng52i39194070.pg.rds.aliyuncs.com;database=AccountingService;port=5432;User Id=postgres;Password=Postgres3141",
@@ -44,5 +44,6 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ReportServerUrl": "http://dev.hsfuel.com:8698"
 }