1、团组操作 --> 新增删除验证(费用录入、出入境费用、收款账单)

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -991,23 +991,23 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GroupDel(GroupDelDto dto)
         {
-            try
-            {
-                var groupData = await _groupRepository.GroupDel(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
+            var diId = dto.Id;
+            if (diId < 1) return Ok(JsonView(false,MsgTips.Id));
+            #region 删除 验证 (费用录入、出入境费用、收款账单)
+            var feeCount = _sqlSugar.Queryable<Grp_CreditCardPayment>().Where(x => x.IsDel == 0 && x.DIId == diId).Count();
+            var eccCount = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(x => x.IsDel == 0 && x.DiId == diId).Count();
+            var frCount = _sqlSugar.Queryable<Fin_ForeignReceivables>().Where(x => x.IsDel == 0 && x.Diid == diId).Count();
+            if (feeCount > 0 || feeCount > 0 || feeCount > 0) return Ok(JsonView(false, "该团组存在费用不可删除!"));
 
-                return Ok(JsonView(true));
-            }
-            catch (Exception ex)
-            {
+            #endregion
 
-                Logs("[response]" + JsonConvert.SerializeObject(dto));
-                Logs(ex.Message);
-                return Ok(JsonView(false, ex.Message));
+            var groupData = await _groupRepository.GroupDel(dto);
+            if (groupData.Code != 0)
+            {
+                return Ok(JsonView(false, groupData.Msg));
             }
+
+            return Ok(JsonView(true));
         }
 
         /// <summary>

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -5062,18 +5062,6 @@ FROM
   Grp_DelegationInfo di
 WHERE
   di.IsDel = 0
-  AND (
-        SELECT
-          CAST(
-            COALESCE(SUM(ItemSumPrice * Rate), 0) AS DECIMAL(12, 2)
-          ) AS GroupSales
-        FROM
-          Fin_ForeignReceivables
-        WHERE
-          IsDel = 0
-          AND di.Id = Diid
-          AND AddingWay IN (0, 1, 2)
-      ) > 0
   AND di.IsBid = 0 
   --AND di.TeamDid IN (38, 39, 40, 1048)
   AND di.VisitDate BETWEEN '{0}' AND '{1}'