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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2652,7 +2652,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
 
 
             _daiRep.CommitTran();
-            return Ok(JsonView(false, "操作成功"));
+            return Ok(JsonView(true, "操作成功"));
         }
 
         private bool extraCost_editCreditCardPayment(Fin_GroupExtraCostDto_OP costDto)
@@ -2793,9 +2793,10 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
             int endIndex = startIndex + dto.PageSize - 1;
             string sql_data = string.Format(@"Select * From (	
                                                 Select row_number() over (order by f.Id Desc) as RowNumber,f.Id,f.DiId,
-												f.PriceName,f.Price,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
+												f.PriceName,f.PriceType,CAST(f.Price as varchar)+' '+s.[Name] as PriceStr,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
                                                 From Fin_GroupExtraCost f
                                                 Inner Join Grp_CreditCardPayment c On f.Id = c.CId
+                                                Inner Join Sys_SetData s On f.PriceCurrency = s.Id
                                                 Left Join Sys_Users u On f.CreateUserId = u.Id
                                                 Where f.IsDel=0 And c.CTable = 1015 {0}
                                                 ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
@@ -2804,6 +2805,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
 												f.PriceName,f.PriceType,f.Price,f.FilePath,f.CreateUserId,f.CreateTime,c.IsAuditGM
                                                 From Fin_GroupExtraCost f
                                                 Inner Join Grp_CreditCardPayment c On f.Id = c.CId
+                                                Inner Join Sys_SetData s On f.PriceCurrency = s.Id
                                                 Left Join Sys_Users u On f.CreateUserId = u.Id
                                                 Where f.IsDel=0 And c.CTable = 1015 {0}
                                                 ) temp ", sqlWhere);
@@ -2818,6 +2820,14 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
 
                 foreach (var item in dataList)
                 {
+                    DateTime dtTemp_CreateTime;
+                    bool b_ct = DateTime.TryParse(item.CreateTime, out dtTemp_CreateTime);
+                    if (b_ct) {
+                        item.CreateTime = dtTemp_CreateTime.ToString("yyyy-MM-dd HH:mm");
+                    }
+
+
+
                     //费用详细类型
                     if (dic_setData.ContainsKey(item.PriceType))
                     {
@@ -2837,7 +2847,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                     //系统用户
                     if (dic_user.ContainsKey(item.CreateUserId))
                     {
-                        item.CreateUserIdStr = dic_setData[item.CreateUserId];
+                        item.CreateUserIdStr = dic_user[item.CreateUserId];
                     }
                     else
                     {
@@ -2845,7 +2855,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                         if (users != null)
                         {
                             item.CreateUserIdStr = users.CnName;
-                            dic_setData.Add(item.CreateUserId, users.CnName);
+                            dic_user.Add(item.CreateUserId, users.CnName);
                         }
                     }
 

OASystem/OASystem.Domain/Entities/EntityBase.cs

@@ -36,7 +36,7 @@ namespace OASystem.Domain.Entities
         /// <summary>
         /// 备注
         /// </summary>
-        [SugarColumn(IsNullable =true,ColumnDataType ="nvarchar(1000)")]
+        [SugarColumn(IsNullable =true,ColumnDataType ="varchar(500)")]
         public string Remark { get; set; }
         /// <summary>
         /// 是否删除

OASystem/OASystem.Domain/Entities/Groups/Grp_HotelReservations.cs

@@ -35,27 +35,27 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 预订号码
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string ReservationsNo { get; set; }
         /// <summary>
         /// 酒店确定编号
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string DetermineNo { get; set; }
         /// <summary>
         /// 所在城市
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string City { get; set; }
         /// <summary>
         /// 酒店名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string HotelName { get; set; }
         /// <summary>
         /// 酒店地址
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string HotelAddress { get; set; }
         /// <summary>
         /// 酒店电话
@@ -76,18 +76,18 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 入住日期
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(80)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string CheckInDate { get; set; }
         /// <summary>
         /// 退房日期
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(80)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string CheckOutDate { get; set; }
         /// <summary>
         /// 预算金额
         /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Budget { get; set; }
         /// <summary>
         /// 预算币种（设置数据外键编号）
@@ -103,7 +103,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 单间单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal SingleRoomPrice { get; set; }
         /// <summary>
         /// 双间数量
@@ -113,7 +113,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 双间单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal DoubleRoomPrice { get; set; }
         /// <summary>
         /// 套房数量
@@ -133,13 +133,13 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 其他房型单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal OtherRoomPrice { get; set; }
         /// <summary>
         /// 佣金
         /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Commission { get; set; }
         /// <summary>
         /// 佣金币种（设置数据外键编号）

OASystem/OASystem.Domain/ViewModels/Financial/Fin_GroupExtraCostView.cs

@@ -14,13 +14,14 @@ namespace OASystem.Domain.ViewModels.Financial
         public string PriceName { get; set; }
         public int PriceType { get; set; }
         public string PriceTypeStr { get; set; }
-        public decimal Price { get; set; }
+        public string PriceStr { get; set; }
         public string FilePath { get; set; }
         public int CreateUserId { get; set; }
         public string CreateUserIdStr { get; set; }
         public string CreateTime { get; set; }
         public int IsAuditGM { get; set; }
         public string IsAuditGMStr { get; set; }
+        
     }
 
     public class Fin_GroupExtraCostViewDataCount

OASystem/OASystem.Infrastructure/Repositories/Groups/TeamRateRepository.cs

@@ -235,72 +235,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             if (dto.PortType == 1)
             {
-
-                #region 团组汇率 - 详细汇率信息
-
-
-                //List<TeamRateModelView> teamRateModels = new List<TeamRateModelView>();
-
-                //List<SetDataInfoView> otherCurrencyData1 = new List<SetDataInfoView>();
-                //var otherCurrencyData = await _setDataRep.GetSetDataBySTId(_setDataRep, 13);
-                //if (otherCurrencyData.Code == 0 && otherCurrencyData.Data != null)
-                //{
-                //    string otherCurrencyStr = JsonConvert.SerializeObject(otherCurrencyData.Data);
-                //    otherCurrencyData1 = JsonConvert.DeserializeObject<List<SetDataInfoView>>(otherCurrencyStr);
-                //    //var otherCurrency = otherCurrencyData1
-                //}
-                //foreach (TeamRateInfoView item in teamRateInfo)
-                //{
-                //    TeamRateModelView teamRateModelInfo = new TeamRateModelView();
-                //    foreach (TeamRateInfoView item1 in teamRateInfo)
-                //    {
-                //        if (item.CTable == item1.CTable)
-                //        {
-                //            teamRateModelInfo.CTableId = item1.CTable;
-                //            teamRateModelInfo.CTableName = item1.Name;
-                //            List<TeamRateDescView> teamRateDescViews = new List<TeamRateDescView>();
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "美元", CurrencyCode = "USD", Rate = item1.RateU });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "欧元", CurrencyCode = "EUR", Rate = item1.RateE });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "日元", CurrencyCode = "JPY", Rate = item1.RateJ });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "港币", CurrencyCode = "HKD", Rate = item1.RateH });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "新西兰元", CurrencyCode = "NZD", Rate = item1.RateN });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "新加坡币", CurrencyCode = "SGD", Rate = item1.RateS });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "澳大利亚元", CurrencyCode = "AUD", Rate = item1.RateA });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "加拿大元", CurrencyCode = "CAD", Rate = item1.RateC });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "泰国铢", CurrencyCode = "THB", Rate = item1.RateT });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "波兰兹罗提", CurrencyCode = "PLN", Rate = item1.RateBL });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "韩国元", CurrencyCode = "KRW", Rate = item1.RateHB });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "斐济元", CurrencyCode = "FJD", Rate = item1.RateFJD });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "土耳其里拉", CurrencyCode = "TRY", Rate = item1.RateTL });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "印度尼西亚卢比", CurrencyCode = "IDR", Rate = item1.RateRP });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "菲律宾比索", CurrencyCode = "PHP", Rate = item1.RatePeso });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "林吉特", CurrencyCode = "MYR", Rate = item1.RateMYR });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "捷克货币", CurrencyCode = "CZK", Rate = item1.RateCZK });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "墨西哥比索", CurrencyCode = "MXN", Rate = item1.RateMXN });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "澳门元", CurrencyCode = "MOP", Rate = item1.RateMOP });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "阿根廷比索", CurrencyCode = "ARS", Rate = item1.RateARS });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "匈牙利福林", CurrencyCode = "HUF", Rate = item1.RateHUF });
-                //            teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = "卢布", CurrencyCode = "RUB", Rate = item1.RateRUB });
-
-                //            SetDataInfoView setData = otherCurrencyData1.Where(x => x.Id == item1.OtherRateId).FirstOrDefault();
-                //            if (setData != null)
-                //            {
-                //                teamRateDescViews.Add(new TeamRateDescView() { CurrencyName = setData.Remark, CurrencyCode = setData.Name, Rate = item1.OtherPrice });
-                //            }
-
-                //            teamRateModelInfo.TeamRates = teamRateDescViews;
-
-
-
-                //        }
-                //    }
-                //    teamRateModels.Add(teamRateModelInfo);
-                //}
-
-
-
-                #endregion
-
                 #region 团组汇率
 
                 List<TeamRateModelView> teamRateModels = new List<TeamRateModelView>();