1.出入境费用明细 签证费用提示 调整

2.应收报表 新增已收款项详细信息(列表显示)

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1668,6 +1668,7 @@ namespace OASystem.API.Controllers
 
             List<PostSyntheticalReceivableByDateRangeView> list_rst = _sqlSugar.SqlQueryable<PostSyntheticalReceivableByDateRangeView>(sql).ToList();
 
+            var setData = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.IsDel == 0).ToList();
 
             decimal sumAll_fr = 0M; //应收
             decimal sumAll_pr = 0M; //已收
@@ -1706,11 +1707,21 @@ namespace OASystem.API.Controllers
                     //2.已收
                     string sql_pr = string.Format(@" Select * From Fin_ProceedsReceived Where IsDel=0 And Diid={0} ", diId);
                     List<Fin_ProceedsReceived> list_pr = _sqlSugar.SqlQueryable<Fin_ProceedsReceived>(sql_pr).ToList();
+                    List<ProceedsReceivedInfoView> prDatas = new List<ProceedsReceivedInfoView>();
                     foreach (var item_pr in list_pr)
                     {
                         sum_pr += item_pr.Price;
                         str_client += string.Format(@"{0};", item_pr.Client);
                         str_schedule += string.Format(@"{0};", item_pr.Remark);
+
+                        prDatas.Add(new ProceedsReceivedInfoView
+                        {
+                            time = item_pr.SectionTime,
+                            client = item_pr.Client,
+                            money = item_pr.Price.ToString("#0.00"),
+                            currency = setData.Find(it => it.Id == item_pr.Currency)?.Name ?? "",
+                            receivablesType = setData.Find(it => it.Id == item_pr.ReceivablesType)?.Name ?? ""
+                        });
                     }
                     if (str_schedule.Length > 0)
                     {
@@ -1744,6 +1755,7 @@ namespace OASystem.API.Controllers
                     item_rst.balPrice = ((sum_fr + sum_extra) - (sum_pr - sum_refund)).ToString("#0.00");
                     item_rst.prClient = str_client;
                     item_rst.schedule = str_schedule;
+                    item_rst.prItem = prDatas;
 
                     string tempVisitDate = Convert.ToDateTime(item_rst.visitDate).ToString("yyyy-MM-dd");
 

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9921,9 +9921,6 @@ namespace OASystem.API.Controllers
 
                 return Ok(JsonView(false, ex.Message));
             }
-
-
-
         }
 
         /// <summary>

OASystem/OASystem.Domain/ViewModels/Financial/Fin_ForeignReceivablesView.cs

@@ -380,6 +380,44 @@ namespace OASystem.Domain.ViewModels.Financial
         /// 收款进度
         /// </summary>
         public string schedule { get; set; }
+
+        /// <summary>
+        /// 子项明细
+        /// </summary>
+        public List<ProceedsReceivedInfoView>? prItem { get; set; }
+    }
+
+    /// <summary>
+    /// 已收详情 Info View
+    /// 新增
+    /// 雷怡 2024-01-08 11:01:55
+    /// </summary>
+    public class ProceedsReceivedInfoView
+    {
+        /// <summary>
+        /// 到款时间
+        /// </summary>
+        public string time { get; set; }
+
+        /// <summary>
+        /// 付款单位
+        /// </summary>
+        public string client { get; set; }
+
+        /// <summary>
+        /// 付款金额
+        /// </summary>
+        public string money { get; set; }
+
+        /// <summary>
+        /// 付款币种
+        /// </summary>
+        public string currency { get; set; }
+
+        /// <summary>
+        /// 付款类型(转账，刷卡等)
+        /// </summary>
+        public string receivablesType { get; set; }
     }
 
     #endregion

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaFeeInfoRepository.cs

@@ -203,14 +203,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 decimal _agencyFee = 0;
                 decimal _GrandBusinessAgencyFee = 0;
                 decimal _PettyBusinessAgencyFee = 0;
-                remark += $@"{countryData?.VisaCountry ?? ""}:签证总费用:{visaFeeTotal}元/人 其中（";
+                
+                string remark1 = "";
                 foreach (var item in kvp.ToList())
                 {
                     if (item.OBType == 1)
                     {
                         if (item.AgencyFee > 0)
                         {
-                            remark += $@"大公务代办费:{item.AgencyFee.ToString("#0.00")}元、";
+                            remark1 += $@"大公务代办费:{item.AgencyFee.ToString("#0.00")}元、";
                             _agencyFee += item.AgencyFee;
                             _GrandBusinessAgencyFee = item.AgencyFee;
                         }
@@ -219,16 +220,18 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     {
                         if (item.AgencyFee > 0)
                         {
-                            remark += $@"小公务代办费:{item.AgencyFee.ToString("#0.00")}元、";
+                            remark1 += $@"小公务代办费:{item.AgencyFee.ToString("#0.00")}元、";
                             _agencyFee += item.AgencyFee;
                             _PettyBusinessAgencyFee = item.AgencyFee;
                         }
                     }
                 }
 
-                if (_otherFee > 0) remark += $@"其他费用:{_otherFee.ToString("#0.00")}元";
+                if (_otherFee > 0) remark1 += $@"其他费用:{_otherFee.ToString("#0.00")}元";
+
+                visaFeeTotal += (_GrandBusinessAgencyFee + _PettyBusinessAgencyFee);
+                remark += $@"{countryData?.VisaCountry ?? ""}:签证总费用:{visaFeeTotal}元/人 其中（{remark1}）;";
 
-                remark += "）;";
                 feeTotal += visaFeeTotal;
 
                 datas.Add(new