处理商务邀请费用看录入 删除未删除C表问题

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2999,8 +2999,10 @@ namespace OASystem.API.Controllers
         {
             try
             {
+
+                _sqlSugar.BeginTran();
                 var res = await _InvitationOfficialActivitiesRep.SoftDeleteByIdAsync<Grp_InvitationOfficialActivities>(dto.Id.ToString(), dto.DeleteUserId);
-                if (!res)
+                if (res)
                 {
                     var result = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == dto.Id && a.CTable == 81).SetColumns(a => new Grp_CreditCardPayment()
                     {
@@ -3008,14 +3010,21 @@ namespace OASystem.API.Controllers
                         DeleteUserId = dto.DeleteUserId,
                         DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                     }).ExecuteCommandAsync();
-                    return Ok(JsonView(false, "删除失败"));
+
+                    if (result > 0 )
+                    {
+                        _sqlSugar.CommitTran();
+                        return Ok(JsonView(true, "删除成功！"));
+                    }
                 }
-                return Ok(JsonView(true, "删除成功！"));
+                _sqlSugar.RollbackTran();
+                return Ok(JsonView(false, "删除失败"));
             }
             catch (Exception ex)
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+
+                _sqlSugar.RollbackTran();
+                return Ok(JsonView(false, ex.Message));
             }
         }
 

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -616,7 +616,9 @@ namespace OASystem.API.Controllers
                         {
                             jjcTotalPrice += item.Price;
                         }
-                        decimal jjcPeopleNum = airJJCPris.Count;
+                        decimal jjcPeopleNum = airJJCPris.GroupBy(item => item.CnName)
+                                                      .Select(group => group.First())
+                                                      .ToList().Count();;
                         JJCAveragePrice = jjcTotalPrice / jjcPeopleNum;
                     }
 
@@ -625,11 +627,13 @@ namespace OASystem.API.Controllers
                     if (airGWCPris.Count > 0)
                     {
                         decimal gwcTotalPrice = 0.00M;
-                        foreach (var item in airJJCPris)
+                        foreach (var item in airGWCPris)
                         {
                             gwcTotalPrice += item.Price;
                         }
-                        decimal gwcPeopleNum = airGWCPris.Count;
+                        decimal gwcPeopleNum = airGWCPris.GroupBy(item => item.CnName)
+                                                      .Select(group => group.First())
+                                                      .ToList().Count();
                         GWCAveragePrice = gwcTotalPrice / gwcPeopleNum;
                     }
                 }