Browse Source

商邀费用录入
InvitationOfficialActivitiesList
2024-05-08 16:19 更改默认值 IsPaySign = -1

leiy 11 months ago
parent
commit
493eaded27

+ 24 - 12
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5033,23 +5033,35 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostEnterExitCostExportDetailsList(EnterExitCostOperateDto dto)
         {
-            try
-            {
-                var data = await _enterExitCostRep.PostEnterExitCostOperate(dto);
+            var data = await _enterExitCostRep.PostEnterExitCostOperate(dto);
 
-                if (data.Code != 0)
-                {
-                    return Ok(JsonView(false, data.Msg));
-                }
-
-                return Ok(JsonView(true, data.Msg, data.Data));
-            }
-            catch (Exception ex)
+            if (data.Code != 0)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(false, data.Msg));
             }
+
+            return Ok(JsonView(true, data.Msg, data.Data));
+
         }
 
+        /// <summary>
+        /// 团组模块 - 出入境费用 - 一键清空
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostEnterExitCostOneClickClear(EnterExitCostOneClickClearDto dto) 
+        {
+            if (dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数;"));
+            if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数;"));
+            if (dto.Id < 1) return Ok(JsonView(false, "请传入有效的Id参数;"));
+
+
+
+            return Ok(JsonView(true, "操作成功"));
+        }
+
+
 
         /// <summary>
         /// 团组模块 - 出入境费用 - 子项删除

+ 12 - 0
OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -240,6 +240,18 @@ namespace OASystem.Domain.Dtos.Groups
     }
 
 
+    /// <summary>
+    /// 出入境费用 - 一键清空 dto
+    /// </summary>
+    public class EnterExitCostOneClickClearDto : PortDtoBase
+    {
+        public int UserId { get; set; }
+
+        public int DiId { get; set; }
+
+        public int Id { get; set; }
+    }
+
     /// <summary>
     /// 团组模块 - 出入境国家费用标准 Page List
     /// </summary>

+ 1 - 1
OASystem/OASystem.Domain/Dtos/Groups/InvitationOfficialActivitiesListDto.cs

@@ -19,7 +19,7 @@ namespace OASystem.Domain.Dtos.Groups
         public int PageIndex { get; set; } = 1;
         public int PageSize { get; set; } = 10;
 
-        public int IsPaySign { get; set; }
+        public int IsPaySign { get; set; } = -1;
     }
 
     /// <summary>

+ 28 - 19
OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -352,25 +352,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
         }
 
-        public async Task<Result> _Del(int id, int diid)
-        {
-            Result result = new Result() { Code = -1 , Msg = "操作成功!" };
-
-            if (id < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
-
-            if (diid < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
-
-            BeginTran();
-
-
-            CommitTran();
-
-            RollbackTran();
-            result.Msg = "操作失败";
-            return result;
-        }
-
-
         /// <summary>
         /// 团组模块 - 出入境国家费用标准 - Add Or Update
         /// </summary>
@@ -427,5 +408,33 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             return result;
         }
+
+
+        /// <summary>
+        /// 一键清空
+        /// 删除主表数据 isdel = 0
+        /// 删除子表数据 delete
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="diid"></param>
+        /// <returns></returns>
+        public async Task<Result> _OneClickClear(int id, int diid)
+        {
+            Result result = new Result() { Code = -1, Msg = "操作成功!" };
+
+            if (id < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
+
+            if (diid < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
+
+            BeginTran();
+
+
+            CommitTran();
+
+            RollbackTran();
+            result.Msg = "操作失败";
+            return result;
+        }
+
     }
 }

+ 1 - 0
OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -146,6 +146,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 sqlWhere += string.Format(@" And i.CreateUserId in ({0})", UserId);
 
+                //雷怡 2024-05-08 16:19 更改默认值 IsPaySign = -1
                 if (dto.IsPaySign != -1) {
                     sqlWhere += string.Format(@" And ccp.IsPay = {0} ", dto.IsPaySign);
                 }