增加4k销售利润统计服务到定时任务；财务费用单增加项目和客户编号

Bailun.DC.Models/dc_base_finance_fee.cs

@@ -329,7 +329,9 @@ namespace Bailun.DC.Models
         /// </summary>
         public DateTime bj_modified { get; set; }
 
+        public string project_type { get; set; }
 
+        public string customer_num { get; set; }
 
     }
 }

Bailun.DC.MonthSaleProfit/Program.cs

@@ -7,24 +7,24 @@ namespace Bailun.DC.MonthSaleProfit
 {
     class Program
     {
-        //static async Task Main(string[] args)
-        //{
-        //    Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-        //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
-        //    {
-        //        services.AddHostedService<Services>();
-        //    });
-
-        //    await builder.RunConsoleAsync();
-        //}
-
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            var _services = new Services();
+            Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+            var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
+            {
+                services.AddHostedService<Services>();
+            });
 
-            var start = DateTime.Parse("2020-11-01");
-            //_services.InitNew(start);
-            _services.InitNew4K(start);
+            await builder.RunConsoleAsync();
         }
+
+        //static void Main(string[] args)
+        //{
+        //    var _services = new Services();
+
+        //    var start = DateTime.Parse("2020-11-01");
+        //    //_services.InitNew(start);
+        //    _services.InitNew4K(start);
+        //}
     }
 }

Bailun.DC.MonthSaleProfit/Services.cs

@@ -40,6 +40,9 @@ namespace Bailun.DC.MonthSaleProfit
                     Console.WriteLine("开始启动新销售利润报表计算 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     InitNew(start);
 
+                    Console.WriteLine("开始启动4K销售利润报表计算 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    InitNew4K(start);
+
                     Console.WriteLine("任务运行完成 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                 }
                 //else if(now.Day==16 && now.Hour==0 && now.Minute==2)
@@ -752,7 +755,10 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
             //付款
             var objPay = listFinance.Where(a => a.cost_form == 1 || (a.cost_form == 3 && a.is_lend == 2));
 
-            m.incoming_operating_other = objIncoming?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_dsp = objIncoming.Where(a => a.project_type.ToUpper() == "DSP")?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_saas = objIncoming.Where(a => a.project_type.ToUpper() == "SAAS")?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_test = objIncoming.Where(a => a.project_type.ToUpper() == "测评")?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_other = objIncoming.Where(a=>a.project_type=="其他"||string.IsNullOrEmpty(a.project_type))?.Sum(a => a.amount_rmb) ?? 0;
 
 
             //营业收入=SAAS套餐收入+测评收入+DSP服务收入+MH代理收入+代运营收入+粉丝系统服务收入+其他收入