Browse Source

更新财务控制器和视图模型初始化

在 `FinancialController.cs` 中初始化 `result` 变量,并格式化 `total_fr`、`total_pr` 和 `total_balance` 属性。调整返回的 JSON 视图以更好地处理无数据情况。

在 `OASystem.API.csproj` 中添加 `System.Security.Permissions` 包的引用,版本为 `6.0.1`。

在 `Fin_ForeignReceivablesView.cs` 中修改 `dataList` 属性的初始化方式,确保其在实例化时为一个新的空列表。
LEIYI 1 month ago
parent
commit
3b18fe56c1

+ 3 - 3
OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1935,7 +1935,7 @@ namespace OASystem.API.Controllers
             decimal sumAll_fr = 0M; //应收
             decimal sumAll_pr = 0M; //已收
             decimal sumAll_balance = 0M; //尾款
-
+            var result = new PostSyntheticalReceivableByDateRangeResultView();
             if (list_rst.Count > 0)
             {
                 int rowNumber = 1;
@@ -2069,7 +2069,7 @@ namespace OASystem.API.Controllers
                     #endregion
                 }
 
-                PostSyntheticalReceivableByDateRangeResultView result = new PostSyntheticalReceivableByDateRangeResultView();
+               
                 result.total_fr = sumAll_fr.ToString("#0.00");
                 result.total_pr = sumAll_pr.ToString("#0.00");
                 result.total_balance = sumAll_balance.ToString("#0.00");
@@ -2137,7 +2137,7 @@ namespace OASystem.API.Controllers
                 }
             }
 
-            return Ok(JsonView(true, "获取成功", "", list_rst.Count));
+            return Ok(JsonView(true, "暂无数据", result, list_rst.Count));
         }
 
         #endregion

+ 1 - 0
OASystem/OASystem.Api/OASystem.API.csproj

@@ -57,6 +57,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.3.35" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.1" />
     <PackageReference Include="TencentCloudSDK.Common" Version="3.0.734" />
     <PackageReference Include="TencentCloudSDK.Ocr" Version="3.0.734" />
     <PackageReference Include="TinyPinyin.Net" Version="1.0.2" />

+ 1 - 1
OASystem/OASystem.Domain/ViewModels/Financial/Fin_ForeignReceivablesView.cs

@@ -322,7 +322,7 @@ namespace OASystem.Domain.ViewModels.Financial
         public string total_pr { get; set; }
         public string total_balance { get; set; }
 
-        public List<PostSyntheticalReceivableByDateRangeView> dataList { get; set; }
+        public List<PostSyntheticalReceivableByDateRangeView> dataList { get; set; } = new List<PostSyntheticalReceivableByDateRangeView>();
     }
 
     public class PostSyntheticalReceivableByDateRangeView