Explorar el Código

优化办公费用统计,新增商邀公务AI实体

- 办公费用统计拆分为月度和年度,分别计算并设置数据源
- 其他微小格式调整
Lyyyi hace 1 día
padre
commit
218224c8a4

+ 8 - 3
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -8747,9 +8747,14 @@ WHERE
                 string time = $"所属期间: {beginDate.ToString("yyyy 年 MM 月 dd 日")} 至 {endDate.ToString("yyyy 年 MM 月 dd 日")}";
                 designer.SetDataSource("Time", time);
 
-                //办公费用
-                decimal officePirce = yearStaffCosts + yearOfficeExpenses;
-                designer.SetDataSource("officePirce", officePirce.ToString("#0.00"));
+                // 办公费用
+                // 月
+                decimal officePirceMonth = monthStaffCosts + monthOfficeExpenses + monthCostSales + monthOtherFees + monthDyhFees + monthDepartFixedExpenses;
+                designer.SetDataSource("officePirceMonth", officePirceMonth.ToString("#0.00"));
+
+                // 年
+                decimal officePirceYear = yearStaffCosts + yearOfficeExpenses+ yearCostSales+ yearOtherFees + yearDyhFees + yearDepartFixedExpenses;
+                designer.SetDataSource("officePirceYear", officePirceYear.ToString("#0.00"));
 
                 //业务类型
                 var groupTypeIds = new List<int>() {

+ 1 - 0
OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/IQiYeWeChatApiService.cs

@@ -248,3 +248,4 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
 
     }
 }
+

+ 2 - 2
OASystem/OASystem.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33110.190
+# Visual Studio Version 18
+VisualStudioVersion = 18.4.11519.219 insiders
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OASystem.API", "OASystem.Api\OASystem.API.csproj", "{3891356C-85CE-4023-9EF8-C34AF3ED85AA}"
 EndProject