团组报表

修改

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -283,7 +283,7 @@ namespace OASystem.API.Controllers
 
                 decimal BalancePayment = frTotalAmount - prTotalAmount + promTotalAmount;
                 _view.GroupIncome = _giView;
-                _view.GroupIncomeStr = string.Format(@"剩余尾款：{0} (包含了收款退还费用数据)", BalancePayment.ConvertToDecimal1().ToString("#0.00"));
+                _view.GroupIncomeStr = string.Format(@"<span style='color:red;'>剩余尾款：{0} CNY(包含了收款退还费用数据)</span>", BalancePayment.ConvertToDecimal1().ToString("#0.00"));
                 #endregion
 
                 #region 团组支出
@@ -609,8 +609,12 @@ namespace OASystem.API.Controllers
                 _amountReceivable = frTotalAmount;
                 _amountReceived = prTotalAmount;
                 _profit = _amountReceived - _totalExpenditure;
-                _view.FeeTotalStr = string.Format(@"当前总支出：{0} CNY\t应收金额：{1} CNY\t已收金额：{2} CNY\t利润(收入-支出)：{3} CNY\t", 
-                                    _totalExpenditure, _amountReceivable, _amountReceived, _profit);
+                _view.FeeTotalStr = string.Format(@"<span>
+                                                    <span>当前总支出：{0} CNY</span> 
+                                                    <span style='padding-left:10px;color: Green;'>应收金额：{1} CNY</span> 
+                                                    <span style='padding-left:10px;color: Green;'>已收金额：{2} CNY</span>
+                                                    <span style='padding-left:10px;color: Green;'>利润(收入-支出)：{3} CNY</span>
+                                                    </span>", _totalExpenditure, _amountReceivable, _amountReceived, _profit);
                 return Ok(JsonView(true, "查询成功!", _view));
             }
             else

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -622,7 +622,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                      Left Join Sys_SetData  sd On sd.IsDel=0 And sd.STid=16  And tr.CTable = sd.Id 
                                                      Where tr.IsDel = 0 And tr.DiId = {0} And tr.CTable = {1}", dto.DiId, dto.CTable);
 
-                    var teamRateInfo =  _sqlSugar.SqlQueryable<TeamRateInfoView>(teamRateInfoSql).ToList();
+                    var teamRateInfo = _sqlSugar.SqlQueryable<TeamRateInfoView>(teamRateInfoSql).ToList();
 
                     #region 团组汇率