Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -38,6 +38,7 @@ using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
+using OASystem.Domain.ViewModels.JuHeExchangeRate;
 using OASystem.Domain.ViewModels.OCR;
 using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Domain.ViewModels.Statistics;
@@ -1053,6 +1054,51 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(groupData.Data));
         }
 
+        /// <summary>
+        /// 成本修改团组信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GroupCostEditGroupInfo(GroupCostEditGroupInfoDto dto)
+        {
+            var jw = JsonView(false, "操作失败");
+            var di = _sqlSugar.Queryable<Grp_DelegationInfo>().First(x => x.Id == dto.Diid && x.IsDel == 0);
+
+            if (di == null)
+            {
+                jw.Msg = "参数有误！";
+                return Ok(jw);
+            }
+
+            #region 添加出访起止时间
+            var startTime = new DateTime();
+            var endTime = new DateTime();
+            if (DateTime.TryParse(dto.VisitDate, out startTime))
+            {
+                endTime = startTime.AddDays(dto.VisitDays - 1);//含当天
+            }
+            else
+            {
+                jw.Msg = "参数有误！";
+                return Ok(jw);
+            }
+            #endregion
+
+            di.VisitDate = startTime;
+            di.VisitPNumber = dto.VisitPNumber;
+            di.VisitDays = dto.VisitDays;
+            di.VisitStartDate = startTime;
+            di.VisitEndDate = endTime;
+
+            var count = _sqlSugar.Updateable(di)
+                .UpdateColumns(x => new { x.VisitDate, x.VisitPNumber, x.VisitDays , x.VisitStartDate, x.VisitEndDate })
+                .ExecuteCommand();
+
+            return Ok( count > 0 ? JsonView(true, "操作成功") : jw);
+        }
+
         /// <summary>
         /// 接团信息 编辑添加
         /// 省份-城市 基础信息数据源

OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -17,6 +17,20 @@ namespace OASystem.Domain.Dtos.Groups
     {
     }
 
+    public class GroupCostEditGroupInfoDto
+    {
+        // 团组Id
+        public int Diid{ get; set; }
+        // 访问日期
+        public string VisitDate { get; set; }
+
+        // 访问人数
+        public int VisitPNumber { get; set; }
+
+        // 访问天数
+        public int VisitDays { get; set; }
+    }
+
     public class GroupProvCityBasicSourceDto : DtoBase
     {
         public string Search { get; set; }