合并冲突解决

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9,6 +9,9 @@ using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Repositories.Groups;
+using TencentCloud.Ocr.V20181119.Models;
+using OASystem.Infrastructure.Tools;
+using System.Web;
 using System.Data;
 using static OASystem.Infrastructure.Repositories.Resource.AirTicketResRepository;
 using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
@@ -668,11 +671,7 @@ namespace OASystem.API.Controllers
                     YSFYEUR += CurrPayStr;
                 }
 
-                _detail.TotalStr1 = string.Format(@"应付款总金额：{0}CNY | {1}USD | {2}EUR", CNY, USD, EUR);
-                _detail.TotalStr2 = string.Format(@"此次付款总金额：{0}CNY | {1}USD | {2}EUR", PayCNY, PayUSD, PayEUR);
-                _detail.TotalStr3 = string.Format(@"目前剩余尾款总金额：{0}CNY | {1}USD | {2}EUR", BalanceCNY, BalanceUSD, BalanceEUR);
-                _detail.TotalStr4 = string.Format(@"已审费用总额：{0}CNY | {1}USD | {2}EUR", YSFYCNY, YSFYUSD, YSFYEUR);
-
+                _detail.IsAuditGM = entity.IsAuditGM;
 
                 detailList.Add(_detail);
 
@@ -680,6 +679,11 @@ namespace OASystem.API.Controllers
 
             #endregion
             _view.DetailList = new List<Grp_CreditCardPaymentDetailView>(detailList);
+            _view.TotalStr1 = string.Format(@"应付款总金额：{0}CNY&nbsp;|&nbsp;{1}USD&nbsp;|&nbsp;{2}EUR", CNY, USD, EUR);
+            _view.TotalStr2 = string.Format(@"此次付款总金额：{0}CNY&nbsp;|&nbsp;{1}USD&nbsp;|&nbsp;{2}EUR", PayCNY, PayUSD, PayEUR);
+            _view.TotalStr3 = string.Format(@"目前剩余尾款总金额：{0}CNY&nbsp;|&nbsp;{1}USD&nbsp;|&nbsp;{2}EUR", BalanceCNY, BalanceUSD, BalanceEUR);
+            _view.TotalStr4 = string.Format(@"已审费用总额：{0}CNY&nbsp;|&nbsp;{1}USD&nbsp;|&nbsp;{2}EUR", YSFYCNY, YSFYUSD, YSFYEUR);
+
 
             return Ok(JsonView(_view));
         }

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CreditCardPaymentView.cs

@@ -47,6 +47,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 审核列表
         /// </summary>
         public List<Grp_CreditCardPaymentDetailView> DetailList { get; set; }
+
+        public string TotalStr1 { get; set; }
+        public string TotalStr2 { get; set; }
+        public string TotalStr3 { get; set; }
+        public string TotalStr4 { get; set; }
     }
 
     public class Grp_CreditCardPaymentDetailView
@@ -102,14 +107,16 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string AuditOperatorName { get; set; }
 
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        public int IsAuditGM { get; set; }
+
         /// <summary>
         /// 超预算比例
         /// </summary>
         public string OverBudget { get; set; }
 
-        public string TotalStr1 { get; set; }
-        public string TotalStr2 { get; set; }
-        public string TotalStr3 { get; set; }
-        public string TotalStr4 { get; set; }
+        
     }
 }