1.迁移数据实体类字段属性部分编辑修改

2.调整三公费用模板下载样式(部门调整)

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -224,7 +224,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostDelDailyPaymentAudit(DP_AuditStatusDto dto)
         {
-            var result = await _daiRep.DelDailyPaymentAudit(dto);
+            var result = await _daiRep.DailyPaymentAudit(dto);
             if (result == null || result.Code != 0)
             {
                 return Ok(JsonView(false, result.Msg));
@@ -338,9 +338,9 @@ namespace OASystem.API.Controllers
             try
             {
                 //迁移数据更新团组汇率
-                //Result teamRateData1 = await _teamRateRep.GetGroupRateChangeData();
+                Result teamRateData1 = await _teamRateRep.GetGroupRateChangeData();
 
-                //var data = await _teamRateRep.PostGroupTeamRateHot();
+                var data = await _teamRateRep.PostGroupTeamRateHot();
 
 
                 Stopwatch stopwatch = Stopwatch.StartNew();

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -320,6 +320,7 @@ namespace OASystem.API.Controllers
             #region 页面操作权限验证
             pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
+
             if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限"));
             #endregion
 
@@ -1916,7 +1917,7 @@ namespace OASystem.API.Controllers
             }
             catch (Exception ex)
             {
-                return Ok(JsonView(false, "程序错误！"));
+                return Ok(JsonView(false, ex.Message));
                 throw;
             }
         }
@@ -3820,8 +3821,10 @@ namespace OASystem.API.Controllers
                             builder.Write("第" + dac.Days.ToString() + "晚：");
 
                             builder.MoveToCell(0, i, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
-                            builder.Write(dac.Place == null ? "" : dac.Place);
+                            //builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
+                            //builder.Write(dac.Place == null ? "" : dac.Place);
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
+
 
                             builder.MoveToCell(0, i, 2, 0);
                             builder.Write("费用标准：");
@@ -3859,7 +3862,7 @@ namespace OASystem.API.Controllers
                             builder.Write("第" + dac.Days.ToString() + "天：");
 
                             builder.MoveToCell(1, i, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
 
                             builder.MoveToCell(1, i, 2, 0);
                             builder.Write("费用标准：");
@@ -3898,7 +3901,8 @@ namespace OASystem.API.Controllers
                             builder.Write("第" + dac.Days.ToString() + "天：");
 
                             builder.MoveToCell(2, i, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");
+
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
 
                             builder.MoveToCell(2, i, 2, 0);
                             builder.Write("费用标准：");
@@ -4017,7 +4021,8 @@ namespace OASystem.API.Controllers
                             //builder.MoveToCell(0, accommodationStartIndex, 0, 0);
                             //builder.Write(DeleClientList[i].LastName + DeleClientList[i].Name); 
                             builder.MoveToCell(0, accommodationStartIndex, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");//城市
+
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
                             builder.MoveToCell(0, accommodationStartIndex, 2, 0);
 
                             string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknown";
@@ -4071,7 +4076,8 @@ namespace OASystem.API.Controllers
                             }
 
                             builder.MoveToCell(0, foodandotherStartIndex, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");//城市
+
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
                             builder.MoveToCell(0, foodandotherStartIndex, 2, 0);
                             string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknown" ;
                             builder.Write(currency);//币种
@@ -4226,14 +4232,14 @@ namespace OASystem.API.Controllers
                         decimal dac1totalPrice = 0.00M, dac2totalPrice = 0.00M;
                         foreach (var item in dac1)
                         {
-                            item.Place = placeData.Find(it => it.Id == item.NationalTravelFeeId)?.Country ?? "Unknown";
+                            item.Place =GetEnterExitCostExportCity(placeData, item.NationalTravelFeeId);
                             if (place.Contains(item.Place))
                             {
                                 continue;
                             }
                             DataRow row = dtdac1.NewRow();
 
-                            row["city"] = placeData.Find(it => it.Id == item.NationalTravelFeeId)?.Country ?? "Unknown";
+                            row["city"] =item.Place;
 
                             string currency = _CurrDatas.Find(it => it.Id == item.Currency)?.Name ?? "Unknwon";
                             decimal rate = rateDatas.Find(it => it.CurrencyCode == currency)?.Rate ?? 0.00M;
@@ -4252,7 +4258,7 @@ namespace OASystem.API.Controllers
                         place = new List<string>();
                         foreach (var item in dac2)
                         {
-                            item.Place = placeData.Find(it => it.Id == item.NationalTravelFeeId)?.Country ?? "Unknown";
+                            item.Place = GetEnterExitCostExportCity(placeData, item.NationalTravelFeeId);
                             if (place.Contains(item.Place))
                             {
                                 continue;
@@ -4431,7 +4437,7 @@ namespace OASystem.API.Controllers
                             //builder.MoveToCell(0, accommodationStartIndex, 0, 0);
                             //builder.Write(DeleClientList[i].LastName + DeleClientList[i].Name); 
                             builder.MoveToCell(0, accommodationStartIndex, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");//城市
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));//城市
                             builder.MoveToCell(0, accommodationStartIndex, 2, 0);
 
                             string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknwon";
@@ -4476,7 +4482,7 @@ namespace OASystem.API.Controllers
                             }
 
                             builder.MoveToCell(0, foodandotherStartIndex, 1, 0);
-                            builder.Write(placeData.Find(it => it.Id == dac.NationalTravelFeeId)?.Country ?? "Unknown");//城市
+                            builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));//城市
                             builder.MoveToCell(0, foodandotherStartIndex, 2, 0);
 
                             string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknwon";
@@ -4586,6 +4592,27 @@ namespace OASystem.API.Controllers
             }
         }
 
+        /// <summary>
+        /// 获取三公费用标准city
+        /// </summary>
+        /// <param name="placeData"></param>
+        /// <param name="nationalTravelFeeId"></param>
+        /// <returns></returns>
+        private string GetEnterExitCostExportCity(List<Grp_NationalTravelFee> placeData,int nationalTravelFeeId)
+        {
+            string _city = string.Empty;
+
+            if (placeData.Count < 1) return _city;
+
+            var data = placeData.Find(it => it.Id == nationalTravelFeeId);
+            if (data == null) return _city;
+
+            string country = data.Country;
+            string city = data.City;
+            if (city.Contains("其他城市") || city.Contains("所有城市")) _city = $"{country}-{city}";
+            else _city = city;
+            return _city;
+        }
 
 
         /// <summary>

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -744,8 +744,7 @@ namespace OASystem.API.Controllers
             }
             catch (Exception ex)
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, ex.Message));
             }
         }
 

OASystem/OASystem.Domain/Entities/Financial/Fin_DailyFeePayment.cs

@@ -15,13 +15,13 @@ namespace OASystem.Domain.Entities.Financial
         /// <summary>
         /// 申请说明
         /// </summary>
-        [SugarColumn(IsNullable = true,ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true,ColumnDataType = "varchar(225)")]
         public string? Instructions { get; set; }
 
         /// <summary>
         /// 合计
         /// </summary>
-        [SugarColumn(IsNullable = true,ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true,ColumnDataType = "decimal(10,2)")]
         public decimal SumPrice { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Financial/Fin_DailyFeePaymentContent.cs

@@ -21,7 +21,7 @@ namespace OASystem.Domain.Entities.Financial
         /// <summary>
         /// 费用名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(varchar(125))")]
         public string? PriceName { get; set; }
 
         /// <summary>
@@ -33,13 +33,13 @@ namespace OASystem.Domain.Entities.Financial
         /// <summary>
         /// 单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Price { get; set; }
 
         /// <summary>
         /// 单项费用合计
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal ItemTotal { get; set; }
 
         

OASystem/OASystem.Domain/Entities/Financial/Fin_ForeignReceivables.cs

@@ -28,7 +28,7 @@ namespace OASystem.Domain.Entities.Financial
         /// <summary>
         /// 费用
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Price { get; set; }
 
         /// <summary>
@@ -46,13 +46,13 @@ namespace OASystem.Domain.Entities.Financial
         /// <summary>
         /// 单项总和
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal ItemSumPrice { get; set; }
 
         /// <summary>
         /// 付款方 弃用 数据保留
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string? To { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Financial/Fin_PaymentRefundAndOtherMoney.cs

@@ -21,7 +21,7 @@ namespace OASystem.Domain.Entities.Financial
         /// <summary>
         /// 费用名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
         public string? PriceName { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_AirTicketReservations.cs

@@ -27,18 +27,18 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 航班日期
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string FlightsDate { get; set; }
 
         /// <summary>
         /// 航班时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(22)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string FlightsTime { get; set; }
         /// <summary>
         /// 抵达时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(22)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string ArrivedTime { get; set; }
         /// <summary>
         /// 是否值机
@@ -99,12 +99,12 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 客人名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
         public string ClientName { get; set; }
         /// <summary>
         /// 出票前报价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal PrePrice { get; set; }
         /// <summary>
         /// 出票前报价币种
@@ -114,7 +114,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 机票全价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Price { get; set; }
         /// <summary>
         /// 币种

OASystem/OASystem.Domain/Entities/Groups/Grp_CreditCardPayment.cs

@@ -40,7 +40,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 消费日期
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string ConsumptionDate { get; set; }
         /// <summary>
         /// 卡类型
@@ -75,7 +75,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 公司银行卡号
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
         public string CompanyBankNo { get; set; }
         /// <summary>
         /// 对方开户行
@@ -100,7 +100,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 财务操作时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string MFOperatorDate { get; set; }
         /// <summary>
         /// 部门经理是否审核 0否1是
@@ -115,7 +115,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 部门经理审核时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string AuditDMDate { get; set; }
         /// <summary>
         /// 财务部是否审核  0否1是
@@ -130,7 +130,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 财务部审核时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string  AuditMFDate { get; set; }
 
         /// <summary>
@@ -147,7 +147,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 总经理审核时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string AuditGMDate { get; set; }
         /// <summary> 
         /// 是否付款  0 否 1 是
@@ -178,7 +178,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 上次付款时间
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string UpdateDate { get; set; }
         /// <summary>
         /// 收款方
@@ -203,5 +203,11 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
         public decimal ExceedBudget { get; set; }
+
+        /// <summary>
+        /// 是否匹配上了信用卡账单
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public decimal IsMatchCreditCard { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_Customers.cs

@@ -26,13 +26,13 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 客户名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
         public string ClientName { get; set; }
 
         /// <summary>
         /// 保险费用
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal InsuranceCosts { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationEnData.cs

@@ -15,26 +15,31 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         ///  区域
         /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Area { get; set; }
 
         /// <summary>
         ///  职务
         /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Job { get; set; }
 
         /// <summary>
         ///  职务英文
         /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string JobEn { get; set; }
 
         /// <summary>
         ///  背景
         /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
         public string DelegationSetting { get; set; }
 
         /// <summary>
         ///  背景英文
         /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
         public string DelegationSettingEn { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationInfo.cs

@@ -40,7 +40,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 团组名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string TeamName { get; set; }
         /// <summary>
         /// 团组类型Id
@@ -144,7 +144,6 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
         public string TellPhone { get; set; }
 
-
         /// <summary>
         /// 微信号
         /// </summary>

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

@@ -71,7 +71,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 客人姓名
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string GuestName { get; set; }
         /// <summary>
         /// 入住日期
@@ -123,7 +123,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 套房单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal SuiteRoomPrice { get; set; }
         /// <summary>
         /// 其他房型数量
@@ -162,12 +162,12 @@ namespace OASystem.Domain.Entities.Groups
         /// 附件地址
         /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string Attachment { get; set; }
         /// <summary>
         /// 信用卡金额
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal CardPrice { get; set; }
         /// <summary>
         /// 信用卡刷卡类型
@@ -190,7 +190,7 @@ namespace OASystem.Domain.Entities.Groups
         /// 早餐费 币种
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public decimal BreakfastCurrency { get; set; }
+        public int BreakfastCurrency { get; set; }
 
         /// <summary>
         /// 由地接支付
@@ -250,7 +250,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 地税
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal GovernmentRent { get; set; }
         /// <summary>
         /// 地税币种
@@ -260,7 +260,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 城市税
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal CityTax { get; set; }
         /// <summary>
         /// 城市税币种

OASystem/OASystem.Domain/Entities/Groups/Grp_VisaInfo.cs

@@ -20,7 +20,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 签证客户
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
         public string VisaClient { get; set; }
         /// <summary>
         /// 签证费用

OASystem/OASystem.Domain/Entities/Resource/Air_TicketBlackCode.cs

@@ -35,22 +35,22 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         ///  报价
         /// <summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
         public string Price { get; set; }
         /// <summary>
         ///  最新报价
         /// <summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
         public string NowPrice { get; set; }
         /// <summary>
         /// 公务舱单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal BCPrice { get; set; }
         /// <summary>
         ///经济舱单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal ECPrice { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Resource/Res_CountryFeeCost.cs

@@ -43,13 +43,13 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 签证费用
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal VisaPrice { get; set; }
 
         /// <summary>
         /// 签证费用描述
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
         public string VisaPriceDesc { get; set; }
 
         /// <summary>
@@ -79,13 +79,13 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 加急费用
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal UrgentPrice { get; set; }
 
         /// <summary>
         /// 加急费用描述 
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
         public string UrgentPriceDesc { get; set; }
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Resource/Res_HotelData.cs

@@ -30,12 +30,12 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 酒店地址
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string Address { get; set; }
         /// <summary>
         /// 酒店电话
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string Tel { get; set; }
         /// <summary>
         /// 酒店传真

OASystem/OASystem.Domain/Entities/Resource/Res_LocalGuideData.cs

@@ -40,7 +40,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 联系人手机号
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string ContactTel { get; set; }
 
         /// <summary>
@@ -52,7 +52,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 联系人传真
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string ContactFax { get; set; }
 
         /// <summary>
@@ -115,6 +115,7 @@ namespace OASystem.Domain.Entities.Resource
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(10)")]
         public string LocalAndChineseScore { get; set; }
+
         /// <summary>
         /// 导游地接的类型：0公司1私人
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Financial/DailyFeePaymentRepository.cs

@@ -458,7 +458,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> DelDailyPaymentAudit(DP_AuditStatusDto dto)
+        public async Task<Result> DailyPaymentAudit(DP_AuditStatusDto dto)
         {
             Result result = new Result() { Code = -2 };
 

OASystem/OASystem.Infrastructure/Repositories/Financial/ProceedsReceivedRepository.cs

@@ -284,7 +284,17 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 {
                     var x = _sqlSugar.Storageable(_ProceedsReceived).ToStorage();
                     addCount = x.AsInsertable.ExecuteCommand();        //不存在插入
-                    updateCount = x.AsUpdateable.ExecuteCommand();    //存在更新
+                    updateCount = x.AsUpdateable.IgnoreColumns(p => new
+                    {
+                        p.SectionTime,
+                        p.Price,
+                        p.Currency,
+                        p.ReceivablesType,
+                        p.Client,
+                        p.CustomerName,
+                        p.CustomerTel,
+                        p.Remark
+                    }).ExecuteCommand();    //存在更新
                 }
                 result.Code = 0;
                 result.Msg = string.Format(@"操作成功!添加：{0}条；更新：{1}；", addCount, updateCount);

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -101,6 +101,22 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 else
                 {
+                    List<DayAndCostInfoView> views = new List<DayAndCostInfoView>()
+                    {
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {},
+                            new DayAndCostInfoView {}
+                    };
+
+                    enterExitCostInfoView.QuarterageData = views;
+                    enterExitCostInfoView.BoardWagesData = views;
+                    enterExitCostInfoView.MiscellaneousFeeData = views;
+                    enterExitCostInfoView.TrainingExpenseData = views;
                     result.Msg = "未查询出数据!!!";
                 }
 

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaPriceRepository.cs

@@ -402,7 +402,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
             catch (Exception ex)
             {
-                 result = new Result() { Code = -2, Msg = "未知错误" };
+                 result = new Result() { Code = -2, Msg = ex.Message };
             }
             return result;
         }

OASystem/OASystem.Infrastructure/Repositories/Resource/HotelDataRepository.cs

@@ -74,9 +74,8 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             catch (Exception ex)
             {
-                return result = new Result() { Code = -2, Msg = "程序错误！" };
-            }
-            return result;
+                return result = new Result() { Code = -2, Msg = ex.Message };
+                }
         }
 
         public async Task<Result> QueryHotelData(QueryHotelDataDto dto)

OASystem/OASystem.Infrastructure/Tools/CommonFun.cs

@@ -1,4 +1,5 @@
-using OASystem.Domain.ViewModels.Financial;
+using NPOI.SS.Formula.Functions;
+using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
 using System.Globalization;
 using System.Reflection;
@@ -351,6 +352,12 @@ public static class CommonFun
 
         if (rates.Count <= 0) return rateStr;
 
+        if (rates.Count == 1 )
+        {
+            var rate = rates[0];
+            return string.Format("{0}({1}):{2}|", rate.CurrencyName, rate.CurrencyCode, rate.Rate);
+        }
+
         foreach (CurrencyInfo rate in rates)
         {
             //存储方式： 美元(USD):6.2350|.......|墨西哥比索(MXN):1.0000