超支费用修改

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2793,9 +2793,10 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
             int endIndex = startIndex + dto.PageSize - 1;
             string sql_data = string.Format(@"Select * From (	
                                                 Select row_number() over (order by f.Id Desc) as RowNumber,f.Id,f.DiId,
-												f.PriceName,f.PriceType,f.Price,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
+												f.PriceName,f.PriceType,CAST(f.Price as varchar)+' '+s.[Name] as PriceStr,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
                                                 From Fin_GroupExtraCost f
                                                 Inner Join Grp_CreditCardPayment c On f.Id = c.CId
+                                                Inner Join Sys_SetData s On f.PriceCurrency = s.Id
                                                 Left Join Sys_Users u On f.CreateUserId = u.Id
                                                 Where f.IsDel=0 And c.CTable = 1015 {0}
                                                 ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
@@ -2804,6 +2805,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
 												f.PriceName,f.PriceType,f.Price,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
                                                 From Fin_GroupExtraCost f
                                                 Inner Join Grp_CreditCardPayment c On f.Id = c.CId
+                                                Inner Join Sys_SetData s On f.PriceCurrency = s.Id
                                                 Left Join Sys_Users u On f.CreateUserId = u.Id
                                                 Where f.IsDel=0 And c.CTable = 1015 {0}
                                                 ) temp ", sqlWhere);
@@ -2818,6 +2820,14 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
 
                 foreach (var item in dataList)
                 {
+                    DateTime dtTemp_CreateTime;
+                    bool b_ct = DateTime.TryParse(item.CreateTime, out dtTemp_CreateTime);
+                    if (b_ct) {
+                        item.CreateTime = dtTemp_CreateTime.ToString("yyyy-MM-dd HH:mm");
+                    }
+
+
+
                     //费用详细类型
                     if (dic_setData.ContainsKey(item.PriceType))
                     {

OASystem/OASystem.Domain/ViewModels/Financial/Fin_GroupExtraCostView.cs

@@ -14,13 +14,14 @@ namespace OASystem.Domain.ViewModels.Financial
         public string PriceName { get; set; }
         public int PriceType { get; set; }
         public string PriceTypeStr { get; set; }
-        public decimal Price { get; set; }
+        public string PriceStr { get; set; }
         public string FilePath { get; set; }
         public int CreateUserId { get; set; }
         public string CreateUserIdStr { get; set; }
         public string CreateTime { get; set; }
         public int IsAuditGM { get; set; }
         public string IsAuditGMStr { get; set; }
+        
     }
 
     public class Fin_GroupExtraCostViewDataCount