+3

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -311,11 +311,9 @@ namespace OASystem.API.Controllers
         //public async Task<IActionResult> UpdateUserDataOldOAToNewOA()
         //{
         //    dynamic view = null;
-
         //    try
         //    {
         //        var _sqlSuar = _loginRep._sqlSugar;
-
         //        var oldOaUsersData = await _sqlSuar.Queryable<OA2014UsersView>().AS("OA2014.dbo.Users").ToListAsync();
         //        var newOaCompanyData = await _sqlSuar.Queryable<Sys_Company>().ToListAsync();
         //        var newOaDepartmentData = await _sqlSuar.Queryable<Sys_Department>().ToListAsync();

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -3152,21 +3152,9 @@ Where dfp.IsDel = 0 And dfp.IsPay = 1
                         x.Contents = _sqlSugar.Queryable<DailyFeePaymentContentView>()
                                               .SetContext(x1 => x1.DFPId, () => x.Id, x)
                                               .ToList();
-
-                        //string str = "";
-                        //int index = 1;
-                        //foreach (var item in x.Contents)
-                        //{
-                        //    string str1 = $"{index}、费用名称：[{item.PriceName}]   单价:[{item.Price.ToString("#0.00")}]   数量:[{item.Quantity.ToString("#0.00")}]   小计:[{item.ItemTotal.ToString("#0.00")}]   备注:[{item.Remark}]";
-
-                        //    if (index == x.Contents.Count) str += str1;
-                        //    else str += str1 + "\r\n";
-                        //    index++;
-                        //}
-                        //x.ContentStr = str;
                     });
 
-                    return Ok(JsonView(true, "操作成功!", _view, total));
+                    return Ok(JsonView(true, "操作成功!", new { data = _view ,total = _view.Sum(x => x.SumPrice) }  , total));
                 }
                 else if (_dto.Type == 2) //view
                 {