1

Edu.EducationCore/Helper/QuarzHelper.cs

@@ -544,6 +544,9 @@ namespace Edu.Education.Helper
                 //financeModule.InsertBatchSimple_V2(100000, 2020);
                 financeModule.InsertBatchSimple_V2(100000, DateTime.Now.Year);
                 financeModule.InsertBatchSimple_V2(100000, DateTime.Now.Year - 1);
+
+                financeModule.InsertBatchSimple_V3(100000, DateTime.Now.Year);
+                financeModule.InsertBatchSimple_V3(100000, DateTime.Now.Year - 1);
                 Console.WriteLine("结束执行简易报表....");
                 LogHelper.Write("结束执行简易报表....");
             }

Edu.Model/Entity/DataStatistics/RB_Report_UpdateRecord.cs

@@ -19,7 +19,7 @@ namespace Edu.Model.Entity.Finance
             set;
         }
         /// <summary>
-        /// 1 团队营收   2 简易报表
+        /// 1 团队营收   2 简易报表   3 新版简易报表
         /// </summary>        
         public int Type
         {

Edu.Model/Entity/DataStatistics/RB_SimpleReport.cs

@@ -213,5 +213,10 @@ namespace Edu.Model.Entity.Finance
         /// 费用类型
         /// </summary>
         public string CostTypeIds { get; set; }
+
+        /// <summary>
+        /// 报表类型  0正常    1新版报表  （教育使用）
+        /// </summary>
+        public int ExpectedType { get; set; }
     }
 }

Edu.Repository/DataStatistics/RB_SimpleReportRepository.cs

@@ -16,10 +16,11 @@ namespace Edu.Repository.Finance
         /// 获取列表
         /// </summary>
         /// <param name="model"></param>
+        /// <param name="ExpectedType">  0正常    1预收报表</param>
         /// <returns></returns>
-        public List<RB_SimpleReport_Extend> GetList(RB_SimpleReport_Extend model)
+        public List<RB_SimpleReport_Extend> GetList(RB_SimpleReport_Extend model, int ExpectedType = 0)
         {
-            string where = " 1=1 ";
+            string where = $" 1=1 and A.ExpectedType ={ExpectedType}";
             if (model.Year > 0)
             {
                 where += string.Format(" AND A." + nameof(RB_SimpleReport_Extend.Year) + "=" + model.Year);

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -1201,9 +1201,9 @@ namespace Edu.WebApi.Controllers.Finance
             var userInfo = base.UserInfo;
             var model = JsonHelper.DeserializeObject<RB_SimpleReport_Extend>(RequestParm.Msg.ToString());
             model.Rb_Group_Id = userInfo.Group_Id;
-            var list = financeModule.GetEasyReportList(new RB_SimpleReport_Extend() { Year = model.Year, Rb_Group_Id = userInfo.Group_Id, BranchId = model.BranchId });
+            var list = financeModule.GetEasyReportList(new RB_SimpleReport_Extend() { Year = model.Year, Rb_Group_Id = userInfo.Group_Id, BranchId = model.BranchId, ExpectedType = model.ExpectedType });
 
-            var fumodel = financeModule.GetUpdateRecordNew();
+            var fumodel = financeModule.GetUpdateRecordNew(model.ExpectedType == 1 ? 3 : 2);
             int Status = 0;
             string UpdateStartTime = "";
             string UpdateEndTime = "";
@@ -1266,7 +1266,7 @@ namespace Edu.WebApi.Controllers.Finance
             var userInfo = base.UserInfo;
             var model = JsonHelper.DeserializeObject<RB_SimpleReport_Extend>(RequestParm.Msg.ToString());
             model.Rb_Group_Id = userInfo.Group_Id;
-            var list = financeModule.GetEasyReportList(new RB_SimpleReport_Extend() { Year = model.Year, Rb_Group_Id = userInfo.Group_Id, BranchId = model.BranchId });
+            var list = financeModule.GetEasyReportList(new RB_SimpleReport_Extend() { Year = model.Year, Rb_Group_Id = userInfo.Group_Id, BranchId = model.BranchId, ExpectedType = model.ExpectedType });
             try
             {
                 foreach (var sitem in list)

Edu.WebApi/appsettings.json

@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",
     "DataStatisticsConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",