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

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -14,7 +14,9 @@ using Org.BouncyCastle.Utilities;
 using Quartz.Util;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Net.Http.Headers;
+using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
 using static QRCoder.PayloadGenerator.SwissQrCode;
 
 namespace OASystem.API.Controllers
@@ -1723,6 +1725,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 throw;
             }
         }
+        
         /// <summary>
         /// 公务出访操作（Status:1.新增,2.修改）
         /// </summary>
@@ -1751,6 +1754,139 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             return Ok(JsonView(true, groupData.Msg, groupData.Data));
 
         }
+        /// <summary>
+        /// 上传文件(邮件截图)
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OfficialActivitiesUploadFiles([FromForm]OfficialActivitiesUploadFilesDto dto)
+        {
+            string networkPath = AppSettingsHelper.Get("GrpFileBaseUrl");
+            string localPath = AppSettingsHelper.Get("GrpFileBasePath");
+            string ptfPath = AppSettingsHelper.Get("GrpFileFtpPath");
+            if (dto.diId < 1 || dto.currUserId < 1)
+            {
+                return Ok(JsonView(false, "参数有误，上传失败！"));
+            }
+            if (dto.files == null || dto.files.Count < 1)
+            {
+                return Ok(JsonView(false, "文件为空，上传失败！"));
+            }
+
+            string localFileDir = $"{localPath}{ptfPath}";
+            List<string> fileUrls = new List<string>();
+            foreach (var file in dto.files)
+            {
+                //文件名称
+                string[] fileNameArray = file.FileName.Split(".");
+
+                string projectFileName = $"{fileNameArray[0].ToString()}{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.{fileNameArray[1].ToString()}";
+                //上传的文件的路径
+                string filePath = $@"{localPath}公务相关文件";
+                if (!Directory.Exists(filePath))
+                {
+                    Directory.CreateDirectory(filePath);
+                }
+                
+                var path = Path.Combine(filePath, projectFileName);
+                //using var stream = new FileStream(path, FileMode.Create);
+                //await file.CopyToAsync(stream);
+
+                using (FileStream fs = System.IO.File.Create(path))
+                {
+                    file.CopyTo(fs);
+                    fs.Flush();
+                }
+
+                fileUrls.Add($"/{ptfPath}公务相关文件/{projectFileName}");
+            }
+
+            var oaInfo = await _sqlSugar.Queryable<Res_OfficialActivities>().Where(x => x.Id == dto.id).FirstAsync();
+
+            var status = false;
+            var _oaInfo = new Res_OfficialActivities()
+            {
+                DiId = dto.diId,
+                ScreenshotOfMailUrl = JsonConvert.SerializeObject(fileUrls),
+                IsDel = 0,
+                CreateUserId = dto.currUserId,
+                CreateTime = DateTime.Now
+            };
+            if (oaInfo == null)
+            {
+                var id = await _sqlSugar.Insertable<Res_OfficialActivities>(_oaInfo)
+                                        .ExecuteReturnIdentityAsync();
+                if (id > 0)
+                {
+                    status = true;
+                    dto.id = id;
+                }
+            }
+            else
+            {
+                var upd = await _sqlSugar.Updateable<Res_OfficialActivities>()
+                                          .SetColumns(x =>  x.ScreenshotOfMailUrl == JsonConvert.SerializeObject(fileUrls))
+                                          .Where(x => x.Id == dto.id)
+                                          .ExecuteCommandAsync();
+
+                if (upd > 0) status = true;
+            }
+
+            fileUrls.ForEach(x => {
+
+                x = $"{networkPath}{x}";
+            });
+
+            if (status)
+            {
+                return Ok(JsonView(true, "操作成功！", new { id = dto.id, fileUrls = fileUrls } ));
+            }
+            return Ok(JsonView(false, "操作失败！"));
+        }
+
+
+        /// <summary>
+        /// 删除文件(邮件截图)
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OfficialActivitiesDelFile(OfficialActivitiesDelFileDto dto)
+        {
+            string networkPath = AppSettingsHelper.Get("GrpFileBaseUrl");
+            string localPath = AppSettingsHelper.Get("GrpFileBasePath");
+            string ptfPath = AppSettingsHelper.Get("GrpFileFtpPath");
+            if (dto.Id < 1 || string.IsNullOrEmpty(dto.FileName))
+            {
+                return Ok(JsonView(false, "参数有误，上传失败！"));
+            }
+            
+            string localFileDir = $"{localPath}{ptfPath}";
+            List<string> fileUrls = new List<string>();
+           
+            var oaInfo = await _sqlSugar.Queryable<Res_OfficialActivities>().Where(x => x.Id == dto.Id).FirstAsync();
+
+            if (oaInfo != null)
+            {
+                if (!string.IsNullOrEmpty(oaInfo.ScreenshotOfMailUrl))
+                {
+                    var urls = JsonConvert.DeserializeObject<List<string>>(oaInfo.ScreenshotOfMailUrl);
+
+                    var filePath = urls.Find(x => x.Contains(dto.FileName));
+                    if (!string.IsNullOrEmpty(filePath)) { }
+                    else return Ok(JsonView(false, "文件不存在！"));
+
+                }
+            }
+
+            return Ok(JsonView(false, "操作失败！"));
+        }
+
+
+
         /// <summary>
         /// 上传文件
         /// </summary>

OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -109,6 +109,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int SumGWC { get; set; }
 
+        /// <summary>
+        ///  公务舱小计选择框
+        /// </summary>
+        public int SumTDC { get; set; }
+
 
         #region 国际旅费子项
         /// <summary>
@@ -121,6 +126,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public decimal OutsaideGWPay { get; set; }
 
+        /// <summary>
+        /// 国际旅费合计（头等舱）
+        /// </summary>
+        public decimal OutsideTDPay { get; set; }
+
         /// <summary>
         ///  国际机票（经济舱）
         /// </summary>
@@ -131,6 +141,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public decimal AirGW { get; set; }
 
+        /// <summary>
+        ///  国际机票（头等舱）
+        /// </summary>
+        public decimal AirTD { get; set; }
+
         /// <summary>
         ///  国外城市间交通费
         /// </summary>
@@ -214,6 +229,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int AirGWC_Checked { get; set; }
 
+        /// <summary>
+        /// 公务舱选择框
+        /// </summary>
+        public int AirTDC_Checked { get; set; }
+
         #endregion
 
     }

OASystem/OASystem.Domain/Dtos/Resource/OfficialActivitiesDto.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.AspNetCore.Http;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -135,6 +136,21 @@ namespace OASystem.Domain.Dtos.Resource
 
     }
 
+    public class OfficialActivitiesUploadFilesDto
+    {
+        public List<IFormFile> files { get; set; }
+        public int id { get; set; }
+        public int diId { get; set; }
+        public int currUserId { get; set; }
+    }
+
+    public class OfficialActivitiesDelFileDto
+    {
+        public int Id { get; set; }
+
+        public string FileName { get; set; }
+    }
+
     /// <summary>
     /// 导出请示参数
     /// </summary>

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

@@ -183,7 +183,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 收款方
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
         public string Payee { get; set; }
         /// <summary>
         /// 人民币费用

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

@@ -190,7 +190,7 @@ namespace OASystem.Domain.Entities.Groups
         /// 合同时间
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime TontractTime { get; set; }
+        public DateTime? TontractTime { get; set; }
         /// <summary>
         /// 是否用于投标
         /// 0 否 1 是

OASystem/OASystem.Domain/Entities/Groups/Grp_EnterExitCost.cs

@@ -83,7 +83,14 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal OutsaideGWPay { get; set; }
 
-        #region 国际旅费合计(经济舱\公务舱)
+        /// <summary>
+        /// 国际旅费合计（头等舱）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal OutsideTDPay { get; set; }
+
+
+        #region 国际旅费合计(经济舱\公务舱\头等舱)
 
         /// <summary>
         ///  国际机票（经济舱）
@@ -97,6 +104,12 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal AirGW { get; set; }
 
+        /// <summary>
+        ///  国际机票（头等舱）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal AirTD { get; set; }
+
         /// <summary>
         ///  国外城市间交通费
         /// </summary>
@@ -173,6 +186,12 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int SumGWC { get; set; }
+        
+        /// <summary>
+        ///  头等舱小计选择框
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int SumTD { get; set; }
 
         /// <summary>
         ///  住宿费合计选择框
@@ -209,6 +228,12 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int AirGWC_Checked { get; set; }
+        
+        /// <summary>
+        /// 头等舱选择框
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AirTDC_Checked { get; set; }
 
         #endregion
 

OASystem/OASystem.Domain/Entities/Resource/Res_OfficialActivities.cs

@@ -147,7 +147,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 邮件截图
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(500)")]
         public string? ScreenshotOfMailUrl { get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -16,7 +16,6 @@ namespace OASystem.Domain.ViewModels.Financial
     public class Fin_DailyFeePaymentView : Fin_DailyFeePayment
     { }
 
-
     public class Fin_DailyFeePaymentPageCount
     {
         /// <summary>

OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -299,7 +299,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 合同时间
         /// </summary>
-        public DateTime TontractTime { get; set; }
+        public DateTime? TontractTime { get; set; }
 
         /// <summary>
         /// 是否用于投标

OASystem/OASystem.Domain/ViewModels/Groups/EnterExitCostView.cs

@@ -313,7 +313,13 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public decimal OutsaideGWPay { get; set; }
 
-        #region 国际旅费合计(经济舱\公务舱)
+
+        /// <summary>
+        /// 国际旅费合计（头等舱）
+        /// </summary>
+        public decimal OutsideTDPay { get; set; }
+
+        #region 国际旅费合计(经济舱\公务舱\头等舱)
 
         /// <summary>
         ///  国际机票（经济舱）
@@ -325,6 +331,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public decimal AirGW { get; set; }
 
+        /// <summary>
+        ///  国际机票（头等舱）
+        /// </summary>
+        public decimal AirTD { get; set; }
+
         /// <summary>
         ///  国外城市间交通费
         /// </summary>
@@ -365,6 +376,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int SumGWC { get; set; }
 
+        /// <summary>
+        ///  头等舱小计选择框
+        /// </summary>
+        public int SumTD { get; set; }
+
         /// <summary>
         ///  住宿费合计选择框
         /// </summary>
@@ -415,6 +431,10 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int AirGWC_Checked { get; set; }
 
+        /// <summary>
+        /// 头等舱选择框
+        /// </summary>
+        public int AirTDC_Checked { get; set; }
         #endregion
     }
 

OASystem/OASystem.Domain/ViewModels/Resource/OfficialActivitiesView.cs

@@ -1,4 +1,5 @@
-using OASystem.Domain.Entities.Resource;
+using Newtonsoft.Json;
+using OASystem.Domain.Entities.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +10,12 @@ namespace OASystem.Domain.ViewModels.Resource
 {
     public class OfficialActivitiesView : Res_OfficialActivities
     {
+
+        public List<string> ScreenshotOfMailUrls { get {
+
+                return !string.IsNullOrEmpty(ScreenshotOfMailUrl) ? JsonConvert.DeserializeObject<List<string>>(ScreenshotOfMailUrl):new List<string>();
+            } }
+
         public string CreateUserName { get; set; }
         public string OfficialFormName { get; set; }
     }

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -371,6 +371,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     _DelegationInfo.TeamName = FormartTeamName(_DelegationInfo.TeamName);
                     _DelegationInfo.VisitCountry = FormartTeamName(_DelegationInfo.VisitCountry);
+
+                    //if (_DelegationInfo.TontractTime)
+                    //{
+
+                    //}
+
                     result.Code = 0;
                     result.Msg = "成功!";
                     result.Data = _DelegationInfo;
@@ -617,7 +623,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         }
                     }
 
-
                     Grp_DelegationInfo delegationInfo = new Grp_DelegationInfo()
                     {
                         SalesQuoteNo = dto.SalesQuoteNo,
@@ -641,7 +646,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         CGRWSPWH = dto.CGRWSPWH,
                         ZZSCBMMC = dto.ZZSCBMMC,
                         ZZSCSPWH = dto.ZZSCSPWH,
-                        TontractTime = Convert.ToDateTime(dto.TontractTime),
+                        TontractTime = string.IsNullOrEmpty(dto.TontractTime) ? null : Convert.ToDateTime(dto.TontractTime),
                         IsBid = dto.IsBid,
                         PaymentMoney = dto.PaymentMoney,
                         PayDay = dto.PayDay,
@@ -708,7 +713,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         CGRWSPWH = dto.CGRWSPWH,
                         ZZSCBMMC = dto.ZZSCBMMC,
                         ZZSCSPWH = dto.ZZSCSPWH,
-                        TontractTime = Convert.ToDateTime(dto.TontractTime),
+                        TontractTime = string.IsNullOrEmpty(dto.TontractTime) ? null : Convert.ToDateTime(dto.TontractTime),
                         IsBid = dto.IsBid,
                         PaymentMoney = dto.PaymentMoney,
                         PayDay = dto.PayDay,

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

@@ -139,72 +139,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
         {
             Result result = new Result() { Code = -1, Msg = "操作失败!" };
 
-            #region MyRegion
-            //var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);
-            ////enterExitCost.InsidePay = enterExitCost.Visa + enterExitCost.YiMiao + enterExitCost.HeSuan + enterExitCost.Service + enterExitCost.Safe + enterExitCost.Ticket;
-            //var quarterageData = _mapper.Map<List<Grp_DayAndCost>>(dto.QuarterageData);  //住宿费 1
-            //quarterageData = quarterageData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
-
-            //var boardWagesData = _mapper.Map<List<Grp_DayAndCost>>(dto.BoardWagesData);  //伙食费 2
-            //boardWagesData = boardWagesData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
-
-            //var miscellaneousFeeData = _mapper.Map<List<Grp_DayAndCost>>(dto.MiscellaneousFeeData);  //公杂费 3
-            //miscellaneousFeeData = miscellaneousFeeData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
-
-            //var trainingExpenseData = _mapper.Map<List<Grp_DayAndCost>>(dto.TrainingExpenseData);    //培训费 4
-            //trainingExpenseData = trainingExpenseData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
-
-
-            ////处理币种string
-            //enterExitCost.CurrencyRemark = CommonFun.GetCurrencyChinaToString(dto.Currencys);
-            //enterExitCost.CreateUserId = dto.UserId;
-
-            //_sqlSugar.BeginTran();
-
-            //if (dto.PortType == 1)
-            //{
-            //    try
-            //    {
-            //        var enterExit = _sqlSugar.Storageable<Grp_EnterExitCost>(enterExitCost).ToStorage();
-
-            //        var enterExitadd = enterExit.AsInsertable.ExecuteCommand();   //不存在插入
-            //        var enterExitedit = enterExit.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-            //        var quarterage = _sqlSugar.Storageable<Grp_DayAndCost>(quarterageData).ToStorage();  //住宿费 1
-            //        var quarterageadd = quarterage.AsInsertable.ExecuteCommand();   //不存在插入                             
-            //        var quarterageedit = quarterage.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-            //        var boardWages = _sqlSugar.Storageable<Grp_DayAndCost>(boardWagesData).ToStorage();  //伙食费 2
-            //        var boardWagesadd = boardWages.AsInsertable.ExecuteCommand();   //不存在插入
-            //        var boardWagesedit = boardWages.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-            //        var miscellaneousFee = _sqlSugar.Storageable<Grp_DayAndCost>(miscellaneousFeeData).ToStorage(); //公杂费 3
-            //        var miscellaneousFeeedd = miscellaneousFee.AsInsertable.ExecuteCommand();   //不存在插入
-            //        var miscellaneousFeeedit = miscellaneousFee.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-            //        var trainingExpense = _sqlSugar.Storageable<Grp_DayAndCost>(trainingExpenseData).ToStorage();    //培训费 4
-            //        var trainingExpenseadd = trainingExpense.AsInsertable.ExecuteCommand();   //不存在插入
-            //        var trainingExpenseedit = trainingExpense.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-            //        _sqlSugar.CommitTran();
-            //        result.Code = 0;
-            //        result.Msg = "操作成功!";
-            //    }
-            //    catch (Exception ex)
-            //    {
-            //        _sqlSugar.RollbackTran();
-            //        result.Msg = ex.Message;
-            //    }
-            //}
-            //else result.Msg = ErrorMsg.Error_Port_Msg;
-            #endregion
-
-            if (dto.SumJJC == 0) {
-                dto.OutsideJJPay = 0;
-            }
-            if (dto.SumGWC == 0) {
-                dto.OutsaideGWPay = 0;
-            }
+            if (dto.SumJJC == 0) dto.OutsideJJPay = 0;
+            if (dto.SumGWC == 0) dto.OutsaideGWPay = 0;
+            if (dto.SumTDC == 0) dto.OutsideTDPay = 0;
 
             var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);
             //enterExitCost.InsidePay = enterExitCost.Visa + enterExitCost.YiMiao + enterExitCost.HeSuan + enterExitCost.Service + enterExitCost.Safe + enterExitCost.Ticket;

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.Statistics.Mcmc;
+using Newtonsoft.Json;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.Resource;
 using OASystem.Domain.Entities.Groups;
@@ -151,33 +152,35 @@ FROM
   LEFT JOIN Sys_SetData sd ON oa.OfficialForm = sd.Id
 {0}", sqlWhere);
                 var OfficialActivities = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql)
-                    .Select(x => new {
-                        x.Id,
-                        x.Country,
-                        x.Area,
-                        x.Client,
-                        x.Date,
-                        x.Time,
-                        x.Address,
-                        x.Contact,
-                        x.Job,
-                        x.Tel,
-                        x.OfficialFormName,
-                        x.Field,
-                        x.ReqSample,
-                        x.Setting,
-                        x.Dresscode,
-                        x.Attendees,
-                        x.IsNeedTrans,
-                        x.Translators,
-                        x.Language,
-                        x.Trip,
-                        x.IsSubmitApproval,
-                        x.IsPay,
-                        x.ConfirmTheInvitation,
-                        x.ScreenshotOfMailUrl,
-                        x.CreateUserName
-                    })
+                    //.Select(x => new
+                    //{
+                    //    x.Id,
+                    //    x.Country,
+                    //    x.Area,
+                    //    x.Client,
+                    //    x.Date,
+                    //    x.Time,
+                    //    x.Address,
+                    //    x.Contact,
+                    //    x.Job,
+                    //    x.Tel,
+                    //    x.OfficialFormName,
+                    //    x.Field,
+                    //    x.ReqSample,
+                    //    x.Setting,
+                    //    x.Dresscode,
+                    //    x.Attendees,
+                    //    x.IsNeedTrans,
+                    //    x.Translators,
+                    //    x.Language,
+                    //    x.Trip,
+                    //    x.IsSubmitApproval,
+                    //    x.IsPay,
+                    //    x.ConfirmTheInvitation,
+                    //    x.ScreenshotOfMailUrl,
+                    //    x.ScreenshotOfMailUrls,
+                    //    x.CreateUserName
+                    //})
                     .FirstAsync();
                 result = new Result() { Code = 0, Msg = "查询成功！", Data = OfficialActivities };
 

OASystem/OASystem.Infrastructure/Repositories/System/SystemMenuPermissionRepository.cs

@@ -127,20 +127,20 @@ namespace OASystem.Infrastructure.Repositories.System
                             {
                                 it.Uid,
                                 it.SmId,
-                                it.Funid,
-                                it.FunctionName,
-                                it.FunctionCode,
-                                it.modulid,
-                                it.modulName,
-                                it.STid,
+                                //it.Funid,
+                                //it.FunctionName,
+                                //it.FunctionCode,
+                                //it.modulid,
+                                //it.modulName,
+                                //it.STid,
                                 it.pageid,
                                 it.PageName,
                                 PageAuth = item.Where(x => x.pageid == it.pageid).Select(x => new { x.Funid, x.FunctionCode, x.FunctionName }),
                                 it.SystemMenuCode,
                                 it.webUrl,
-                                it.AndroidUrl,
-                                it.IosUrl,
-                                it.icon,
+                                //it.AndroidUrl,
+                                //it.IosUrl,
+                                //it.icon,
                             });
 
                             pageData = pageData.GroupBy(x => x.SmId).Select(y => y.First());

OASystem/OpWin/Home.cs

@@ -1760,7 +1760,7 @@ namespace OpWin
                                         //Ìí¼ÓÊý¾Ý
                                         if (time.Length >= 2)
                                         {
-                                            OA_DataTable.Rows.Add(time[0], time[1], listoa[b].Client, listoa[b].Address, listoa[b].Contact, listoa[b].Tel, listoa[b].Dresscode, listoa[b].IsNeedTrans, listoa[b].language);
+                                            OA_DataTable.Rows.Add(time[0], time[1], listoa[b].Client, listoa[b].Address, listoa[b].Contact, listoa[b].Tel, listoa[b].Dresscode, listoa[b].IsNeedTrans, listoa[b].Language);
                                         }
                                         else
                                         {
@@ -3472,7 +3472,7 @@ namespace OpWin
                                     //Ìí¼ÓÊý¾Ý
                                     if (time.Length >= 2)
                                     {
-                                        OA_DataTable.Rows.Add(time[0], time[1], listoa[b].Client, listoa[b].Address, listoa[b].Contact, listoa[b].Tel, listoa[b].Dresscode, listoa[b].IsNeedTrans, listoa[b].language);
+                                        OA_DataTable.Rows.Add(time[0], time[1], listoa[b].Client, listoa[b].Address, listoa[b].Contact, listoa[b].Tel, listoa[b].Dresscode, listoa[b].IsNeedTrans, listoa[b].Language);
                                     }
                                     else
                                     {