jiangjc 1 year ago
parent
commit
4a4d6c1de4

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

@@ -2831,7 +2831,7 @@ 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.PriceDetailType,f.Price,f.PriceCount,CAST(f.PriceSum as varchar)+' '+s.[Name] as PriceStr,
+												f.PriceName,f.PriceType,f.PriceDetailType,CAST(f.Price as varchar)+' '+s.[Name] as PriceStr,f.PriceCount,CAST(f.PriceSum as varchar)+' '+s.[Name] as PriceSumStr,
                                                 f.CreateUserId,f.PriceDt,c.IsAuditGM												
                                                 From Fin_GroupExtraCost f
                                                 Inner Join Grp_CreditCardPayment c On f.Id = c.CId
@@ -2863,7 +2863,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                     bool b_ct = DateTime.TryParse(item.PriceDt, out dtTemp_PriceDt);
                     if (b_ct)
                     {
-                        item.PriceDt = dtTemp_PriceDt.ToString("yyyy-MM-dd HH:mm");
+                        item.PriceDt = dtTemp_PriceDt.ToString("yyyy-MM-dd");
                     }
 
 

+ 1 - 0
OASystem/OASystem.Domain/ViewModels/Financial/Fin_GroupExtraCostView.cs

@@ -18,6 +18,7 @@ namespace OASystem.Domain.ViewModels.Financial
         public string Price { get; set; }
         public int PriceCount { get; set; }
         public string PriceStr { get; set; }
+        public string PriceSumStr { get; set; }
         public int CreateUserId { get; set; }
         public string CreateUserIdStr { get; set; }
         public string PriceDt { get; set; }