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

OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -64,7 +64,7 @@ namespace OASystem.API.Controllers
                     int maxRowIndex = dataList.Max(s => s.row_start);
                     int maxColIndex = headerList.Max(s => s.col_start) + 1;
                     Dictionary<int, string> dicHeader = new Dictionary<int, string>();
-                    List<string> listNameStr = new List<string>() { "姓名", "name" };
+                    List<string> listNameStr = new List<string>() { "姓名", "name", "姓 名" };
                     List<string> listSexStr = new List<string>() { "性别", "gender", "sex" };
                     List<string> listDOBStr = new List<string>() { "D.O.B", "出生年月", "生日", "出生日期" };
                     List<string> listIdCard = new List<string>() { "身份证号码", "身份证" };
@@ -72,6 +72,8 @@ namespace OASystem.API.Controllers
                     List<string> listJobStr = new List<string>() { "职务", "title", "职位", "所在单位及职务" , "单位及职务" };
                     List<string> listMobileStr = new List<string>() { "联系电话", "mobile" };
                     List<string> listAgeStr = new List<string>() { "年龄", "age" };
+                    List<string> listBeiZhu = new List<string>() { "备注" };
+
                     for (int i = 0; i < headerList.Count; i++)
                     {
                         string words = headerList[i].words.Trim().ToLower();
@@ -107,7 +109,10 @@ namespace OASystem.API.Controllers
                         {
                             dicHeader.Add(i, "Age");
                         }
-
+                        else if (listBeiZhu.Exists(s => s == words))
+                        {
+                            dicHeader.Add(i, "BeiZhu");
+                        }
                     }
 
                     List<BaiduClientOCRView> ClientArr = new List<BaiduClientOCRView>();

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -63,6 +63,7 @@ using System.Xml;
 using OASystem.Domain.Dtos.QiYeWeChat;
 using static NPOI.POIFS.Crypt.CryptoFunctions;
 using Aspose.Words.Lists;
+using OASystem.API.OAMethodLib.YouDaoAPI;
 
 namespace OASystem.API.Controllers
 {
@@ -803,7 +804,7 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(groupData.Data));
         }
-       
+
         /// <summary>
         /// 根据CTable类型返回对应的团组名称及简单数据（APP端）
         /// </summary>
@@ -1288,7 +1289,7 @@ namespace OASystem.API.Controllers
                 List<Grp_VisaInfo> _VisaInfos = await _groupRepository
                                                       .Query<Grp_VisaInfo>(s => s.DIId == _dto.DiId && s.IsDel == 0)
                                                       .ToListAsync();
-                
+
                 /*
                  *81: //邀请/公务活动
                  */
@@ -1301,7 +1302,7 @@ namespace OASystem.API.Controllers
                  */
                 List<Grp_Customers> _Customers = await _groupRepository.Query<Grp_Customers>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
-               
+
                 /*
                  *  Lable = 85 机票预订
                  */
@@ -1489,7 +1490,8 @@ namespace OASystem.API.Controllers
 
 
                                     var currencyData = currencyItems.Where(s => s.Id == item.Currency && s.IsDel == 0).FirstOrDefault();
-                                    if (currencyData != null) {
+                                    if (currencyData != null)
+                                    {
                                         carCurrencyCode = currencyData.Name;
                                         carCurrencyName = currencyData.Remark;
                                     }
@@ -1605,7 +1607,8 @@ namespace OASystem.API.Controllers
                             break;
                         case 1015://超支费用
                             Fin_GroupExtraCost groupExtraCost = _GroupExtraCosts.Where(s => s.Id == entity.CId).FirstOrDefault();
-                            if (groupExtraCost != null) {
+                            if (groupExtraCost != null)
+                            {
                                 _detail.PriceNameContent = groupExtraCost.PriceName;
                                 _detail.PriceMsgContent = "备注：" + groupExtraCost.Remark;
                             }
@@ -1969,7 +1972,7 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
-        
+
         /// <summary>
         /// 根据舱位类型查询接团客户名单信息
         /// </summary>
@@ -2028,30 +2031,36 @@ namespace OASystem.API.Controllers
             return Ok(jw);
         }
 
-        private List<SimplClientInfo> getSimplClientList(int diId) {
+        private List<SimplClientInfo> getSimplClientList(int diId)
+        {
             string sql = string.Format("select b.Id,b.Pinyin,b.lastName,b.firstName,b.phone from  Grp_TourClientList a, Crm_DeleClient b where a.clientid = b.id and a.isdel = 0 and a.diid = {0}", diId);
             List<SimplClientInfo> arr = _sqlSugar.SqlQueryable<SimplClientInfo>(sql).ToList();
             return arr;
         }
 
-        private string getClientNameStr(List<SimplClientInfo> list, string origin) {
+        private string getClientNameStr(List<SimplClientInfo> list, string origin)
+        {
             string result = origin;
 
-            if (Regex.Match(origin, @"\d+,?").Value.Length > 0) {
+            if (Regex.Match(origin, @"\d+,?").Value.Length > 0)
+            {
                 string[] temparr = origin.Split(',');
                 string fistrStr = temparr[0];
                 int count = temparr.Count();
 
                 int tempId;
                 bool success = int.TryParse(fistrStr, out tempId);
-                if (success) {
+                if (success)
+                {
                     SimplClientInfo tempInfo = list.FirstOrDefault(s => s.Id == tempId);
-                    if (tempInfo != null) {
+                    if (tempInfo != null)
+                    {
                         if (count > 1)
                         {
                             result = string.Format(@"{0}{1}等{2}人", tempInfo.LastName, tempInfo.FirstName, count);
                         }
-                        else { 
+                        else
+                        {
                             result = string.Format(@"{0}{1}", tempInfo.LastName, tempInfo.FirstName);
                         }
                     }
@@ -3074,7 +3083,7 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
-        
+
         /// <summary>
         /// 商邀费用录入操作（Status:1.新增,2.修改）
         /// </summary>
@@ -3086,7 +3095,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Result groupData = await _InvitationOfficialActivitiesRep.OpInvitationOfficialActivities(dto,_setDataRep.PostCurrencyByDiid);
+                Result groupData = await _InvitationOfficialActivitiesRep.OpInvitationOfficialActivities(dto, _setDataRep.PostCurrencyByDiid);
                 if (groupData.Code != 0)
                 {
                     return Ok(JsonView(false, groupData.Msg));
@@ -3124,7 +3133,7 @@ namespace OASystem.API.Controllers
                 {
                     int _diId = 0;
                     var _ioaInfo = _sqlSugar.Queryable<Grp_InvitationOfficialActivities>().Where(it => it.Id == dto.Id).First();
-                    if (_ioaInfo!=null)
+                    if (_ioaInfo != null)
                     {
                         _diId = _ioaInfo.DiId;
                     }
@@ -3136,7 +3145,7 @@ namespace OASystem.API.Controllers
                                               DeleteUserId = dto.DeleteUserId,
                                               DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                                           })
-                                          .Where(a => a.CId == dto.Id && a.DIId == _diId && a.CTable == 81 )
+                                          .Where(a => a.CId == dto.Id && a.DIId == _diId && a.CTable == 81)
                                           .ExecuteCommand();
 
                     if (res2 > 0)
@@ -3556,7 +3565,7 @@ namespace OASystem.API.Controllers
 
                 //默认币种显示
                 List<CurrencyInfo> _currencyInfos = new List<CurrencyInfo>()
-                { 
+                {
                     new CurrencyInfo (){ CurrencyCode="USD",CurrencyName = "美元",Rate = 0.0000M },
                     new CurrencyInfo (){ CurrencyCode="EUR",CurrencyName = "欧元",Rate = 0.0000M },
                     new CurrencyInfo (){ CurrencyCode="GBP",CurrencyName = "英镑",Rate = 0.0000M },
@@ -3663,7 +3672,7 @@ namespace OASystem.API.Controllers
                     return Ok(JsonView(false, "请传入有效的DiId参数；"));
                 }
 
-                if (dto.ExportType <1)
+                if (dto.ExportType < 1)
                 {
                     return Ok(JsonView(false, "请传入有效的ExportType参数； 1 明细表 2 表格"));
                 }
@@ -3693,7 +3702,7 @@ namespace OASystem.API.Controllers
                 var _DelegationInfo = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.IsDel == 0 && it.Id == dto.DiId).First();
                 var DeleClientList = _sqlSugar.Queryable<Grp_TourClientList>()
                                                       .LeftJoin<Crm_DeleClient>((tcl, dc) => tcl.ClientId == dc.Id && dc.IsDel == 0)
-                                                      .LeftJoin<Crm_CustomerCompany>((tcl, dc,cc) => dc.CrmCompanyId == cc.Id && dc.IsDel == 0)
+                                                      .LeftJoin<Crm_CustomerCompany>((tcl, dc, cc) => dc.CrmCompanyId == cc.Id && dc.IsDel == 0)
                                                       .Where((tcl, dc, cc) => tcl.IsDel == 0 && tcl.DiId == dto.DiId)
                                                       .Select((tcl, dc, cc) => new
                                                       {
@@ -4079,7 +4088,7 @@ namespace OASystem.API.Controllers
 
                             builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
                             builder.MoveToCell(0, foodandotherStartIndex, 2, 0);
-                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknown" ;
+                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknown";
                             builder.Write(currency);//币种
                             builder.MoveToCell(0, foodandotherStartIndex, 3, 0);
                             builder.Write(dac.Cost.ToString("#0.00"));//标准
@@ -4584,7 +4593,7 @@ namespace OASystem.API.Controllers
                     }
                 }
 
-                return Ok(JsonView(false,"操作失败!"));
+                return Ok(JsonView(false, "操作失败!"));
             }
             catch (Exception ex)
             {
@@ -5160,7 +5169,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Result groupData =  _carTouristGuideGroundRep.CarTouristGuideGroundContent(dto);
+                Result groupData = _carTouristGuideGroundRep.CarTouristGuideGroundContent(dto);
                 if (groupData.Code != 0)
                 {
                     return Ok(JsonView(false, groupData.Msg));
@@ -5183,7 +5192,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Result groupData =  _carTouristGuideGroundRep.OpCarTouristGuideGroundContentById(dto);
+                Result groupData = _carTouristGuideGroundRep.OpCarTouristGuideGroundContentById(dto);
                 if (groupData.Code != 0)
                 {
                     return Ok(JsonView(false, groupData.Msg));
@@ -5227,7 +5236,7 @@ namespace OASystem.API.Controllers
         public IActionResult OpCarCityResult()
         {
             var jw = JsonView(false);
-            var data = _sqlSugar.Queryable<Grp_NationalTravelFee>().Where(x=>x.IsDel == 0).Select(x => new
+            var data = _sqlSugar.Queryable<Grp_NationalTravelFee>().Where(x => x.IsDel == 0).Select(x => new
             {
                 x.Id,
                 x.Country,
@@ -5281,7 +5290,7 @@ namespace OASystem.API.Controllers
             {
                 var black = blackCode.First();
                 black.BlackCode = black.BlackCode == null ? "" : black.BlackCode;
-                var blackSp =  Regex.Split(black.BlackCode, "\\d+\\.", RegexOptions.IgnoreCase).Where(x=>!string.IsNullOrWhiteSpace(x)).ToArray();
+                var blackSp = Regex.Split(black.BlackCode, "\\d+\\.", RegexOptions.IgnoreCase).Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
                 if (blackSp.Length > 0)
                 {
                     try
@@ -5305,7 +5314,7 @@ namespace OASystem.API.Controllers
                             {
                                 cityArrCode.Add(startCity.ToUpper());
                             }
-                            
+
                             var endCity = IndexSelect.Substring(3, 3);
                             cityArrCode.Add(endCity.ToUpper());
                         }
@@ -5323,7 +5332,7 @@ namespace OASystem.API.Controllers
                         var cityArr = _sqlSugar.SqlQueryable<Res_ThreeCode>(sql).ToList();
                         foreach (var item in cityArrCode)
                         {
-                            var find =  cityArr.Find(x => x.Three.ToUpper() == item.ToUpper());
+                            var find = cityArr.Find(x => x.Three.ToUpper() == item.ToUpper());
                             if (find != null)
                             {
                                 city += find.City + "/";
@@ -5342,9 +5351,12 @@ namespace OASystem.API.Controllers
                 }
 
             }
+            else
+            {
+                city = "未录入黑屏代码";
+            }
 
-
-            var OpTravelList =  _sqlSugar.Queryable<Grp_TravelList>().Where(x=>x.Diid == diid && x.IsDel == 0).OrderBy(x=>x.Date).Select(x=> new TravelArrView
+            var OpTravelList = _sqlSugar.Queryable<Grp_TravelList>().Where(x => x.Diid == diid && x.IsDel == 0).OrderBy(x => x.Date).Select(x => new TravelArrView
             {
                 Date = x.Date,
                 Days = x.Days,
@@ -5354,7 +5366,7 @@ namespace OASystem.API.Controllers
                 Traffic_Second = x.Traffic_Second,
                 Trip = x.Trip,
                 WeekDay = x.WeekDay,
-                 Id = x.Id
+                Id = x.Id
             }).ToList();
 
             jw.Data = new
@@ -5398,11 +5410,11 @@ namespace OASystem.API.Controllers
 
             var isTrue = _sqlSugar.Updateable<Grp_TravelList>().Where(x => x.Diid == dto.Diid && x.IsDel == 0)
                 .SetColumns(x => new Grp_TravelList
-            {
-                DeleteTime = DateTime.Now.ToString("yyyy-MM-dd"),
-                DeleteUserId = dto.UserId,
-                IsDel = 1,
-            }).ExecuteCommand();
+                {
+                    DeleteTime = DateTime.Now.ToString("yyyy-MM-dd"),
+                    DeleteUserId = dto.UserId,
+                    IsDel = 1,
+                }).ExecuteCommand();
             jw = JsonView(true);
             return Ok(jw);
         }
@@ -5415,7 +5427,7 @@ namespace OASystem.API.Controllers
         public IActionResult TravelSave(TravelSaveDto dto)
         {
             var jw = JsonView(false);
-            if(dto.Arr.Count > 0)
+            if (dto.Arr.Count > 0)
             {
                 try
                 {
@@ -5463,7 +5475,7 @@ namespace OASystem.API.Controllers
             //数据源
             List<Grp_TravelList> _travelList = new List<Grp_TravelList>();
             int diid = 0;
-            var Find =  _sqlSugar.Queryable<Grp_DelegationInfo>().First(x=>x.Id == dto.Diid);
+            var Find = _sqlSugar.Queryable<Grp_DelegationInfo>().First(x => x.Id == dto.Diid);
             if (Find == null)
             {
                 jw.Msg = "请选择正确的团组!";
@@ -5677,7 +5689,7 @@ namespace OASystem.API.Controllers
 
             //模板路径
             string tempPath = AppSettingsHelper.Get("WordBasePath") + "Travel/日行程3.docx";
-            
+
             //载入模板
             Document doc = null;
             DocumentBuilder builder = null;
@@ -5776,7 +5788,7 @@ namespace OASystem.API.Controllers
             try
             {
                 doc.Save(path, Aspose.Words.SaveFormat.Doc);
-                jw = JsonView(true,"导出成功", path);
+                jw = JsonView(true, "导出成功", path);
             }
             catch (Exception)
             {
@@ -6063,7 +6075,7 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="num"></param>
         /// <returns></returns>
-         string GetNum(string num)
+        string GetNum(string num)
         {
 
             string str = "";
@@ -6145,7 +6157,7 @@ namespace OASystem.API.Controllers
             return str;
         }
 
-         List<Crm_DeleClient> GetByDiidClient(int DIID)
+        List<Crm_DeleClient> GetByDiidClient(int DIID)
         {
             return _sqlSugar.Queryable<Crm_DeleClient>().Where(x => x.DiId == DIID && x.IsDel == 0).ToList();
         }
@@ -6159,7 +6171,7 @@ namespace OASystem.API.Controllers
         /// <param name="startDate"></param>
         /// <param name="endDate"></param>
         /// <returns></returns>
-         string GetLonger(string temp)
+        string GetLonger(string temp)
         {
             string str = "";
             switch (temp.ToUpper())
@@ -6313,7 +6325,7 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="temp"></param>
         /// <returns></returns>
-         string GetDaysByMonth(string Month, int year)
+        string GetDaysByMonth(string Month, int year)
         {
             string str = "";
             //判断是否是闰年
@@ -6518,9 +6530,9 @@ namespace OASystem.API.Controllers
                     spArr = countryArr.Split("、");
                 }
 
-                foreach (var item in spArr.Where(x=>!string.IsNullOrWhiteSpace(x)).ToList())
+                foreach (var item in spArr.Where(x => !string.IsNullOrWhiteSpace(x)).ToList())
                 {
-                   var dbQueryCountry = _sqlSugar.Queryable<Res_CountryFeeCost>().First(x => x.VisaCountry.Contains(item));
+                    var dbQueryCountry = _sqlSugar.Queryable<Res_CountryFeeCost>().First(x => x.VisaCountry.Contains(item));
                     if (dbQueryCountry != null)
                     {
                         visaCountryInfoArr.Add(dbQueryCountry);
@@ -6683,7 +6695,7 @@ namespace OASystem.API.Controllers
                 if (GroupCostParameter.IsShare == 0) IsShare = 1;
                 else if (GroupCostParameter.IsShare == 1) IsShare = 0;
 
-                bool isTrue = await _GroupCostParameterRepository.UpdateIsShareById(GroupCostParameter.Id,IsShare);
+                bool isTrue = await _GroupCostParameterRepository.UpdateIsShareById(GroupCostParameter.Id, IsShare);
                 string msg = string.Empty;
 
                 if (isTrue)
@@ -6754,9 +6766,9 @@ namespace OASystem.API.Controllers
                 airSouer.Add("GWCSUITE", "公务舱及酒店套房");
                 airSouer.Add("JJCSUITE", "经济舱及酒店套房");
 
-                var groupCostType = dto.airs.GroupBy(x => x.costType).OrderBy(x=>x.Key);
+                var groupCostType = dto.airs.GroupBy(x => x.costType).OrderBy(x => x.Key);
 
-                foreach(var cost in groupCostType)
+                foreach (var cost in groupCostType)
                 {
                     var List = cost.ToList();
 
@@ -6790,11 +6802,11 @@ namespace OASystem.API.Controllers
                             {
                                 if (ListItem.code.Contains("TBR"))
                                 {
-                                    itemStr += "团费（" + airSouer[ListItem.code] + "）    RMB " + ListItem.price.ToString("F2")  + "/人*" + ListItem.number + "(" + (ListItem.number / 2) + "间( ............合计 RMB " + (ListItem.number * ListItem.price).ToString("#0.00") + "\n";
+                                    itemStr += "团费（" + airSouer[ListItem.code] + "）    RMB " + ListItem.price.ToString("F2") + "/人*" + ListItem.number + "(" + (ListItem.number / 2) + "间( ............合计 RMB " + (ListItem.number * ListItem.price).ToString("#0.00") + "\n";
                                 }
                                 else
                                 {
-                                    itemStr += "团费（" + airSouer[ListItem.code] + "）    RMB " + ListItem.price.ToString("F2")  + "/人*" + ListItem.number + "(" + ListItem.number + "间( ............合计 RMB " + (ListItem.number * ListItem.price).ToString("#0.00") + "\n";
+                                    itemStr += "团费（" + airSouer[ListItem.code] + "）    RMB " + ListItem.price.ToString("F2") + "/人*" + ListItem.number + "(" + ListItem.number + "间( ............合计 RMB " + (ListItem.number * ListItem.price).ToString("#0.00") + "\n";
                                 }
 
                                 TotalPrice += (ListItem.number * ListItem.price);
@@ -6802,7 +6814,7 @@ namespace OASystem.API.Controllers
                         }
                     }
                 }
-                
+
 
                 #region 替换Word模板书签内容
 
@@ -6846,7 +6858,7 @@ namespace OASystem.API.Controllers
 
                 //doc.Save((AppSettingsHelper.Get("WordBasePath") + "Template/") + strFileName);
 
-                return Ok(JsonView(true,"",new
+                return Ok(JsonView(true, "", new
                 {
                     Data = bytes,
                     strFileName,
@@ -6854,7 +6866,7 @@ namespace OASystem.API.Controllers
             }
             else
             {
-                return Ok(JsonView(false,"团组信息不存在!"));
+                return Ok(JsonView(false, "团组信息不存在!"));
             }
         }
 
@@ -6867,7 +6879,7 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> ExportGroupCostExcelFile(GroupCostExportExcelFile dto)
         {
 
-             var jw =  JsonView(false);
+            var jw = JsonView(false);
 
             if (dto.Diid == 0)
             {
@@ -6992,18 +7004,18 @@ namespace OASystem.API.Controllers
             int HideRows = 0;
             List<int> hideRowsList = new List<int>();
             decimal TzZCB2 = 0.00M, TzZLR2 = 0.00M, TzZBJ2 = 0.00M;
-             
+
 
             #region A段left数据
             var left = dto.leftInfo.Find(x => x.Type == "A");
             if (left == null)
             {
-                  return Ok(jw);
+                return Ok(jw);
             }
             var leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("签证"));
             if (leftBindData != null)
             {
-               
+
                 designer.SetDataSource("VisaDRCB", leftBindData.cb);
                 designer.SetDataSource("VisaRS", leftBindData.rs);
                 designer.SetDataSource("VisaXS", leftBindData.xs);
@@ -7013,7 +7025,8 @@ namespace OASystem.API.Controllers
                 designer.SetDataSource("VisaDRLR", decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs) - decimal.Parse(leftBindData.cb));
                 designer.SetDataSource("VisaZLR", ((decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs)) - decimal.Parse(leftBindData.cb)) * decimal.Parse(leftBindData.rs));
             }
-            else {
+            else
+            {
                 hideRowsList.Add(Row + startIndex + HideRows);
                 //ws.Cells.HideRows((Row + startIndex + HideRows), 2);
             }
@@ -7022,7 +7035,7 @@ namespace OASystem.API.Controllers
             leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("保险"));
             if (leftBindData != null)
             {
-               
+
                 designer.SetDataSource("BXDRCB", leftBindData.cb);
                 designer.SetDataSource("BXRS", leftBindData.rs);
                 designer.SetDataSource("BXXS", leftBindData.xs);
@@ -7061,7 +7074,7 @@ namespace OASystem.API.Controllers
             leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("经济舱"));
             if (leftBindData != null)
             {
-               
+
                 designer.SetDataSource("JPJJCCB", leftBindData.cb);
                 designer.SetDataSource("JPJJCPnum", leftBindData.rs);
                 designer.SetDataSource("JPJJCXS", leftBindData.xs);
@@ -7081,7 +7094,7 @@ namespace OASystem.API.Controllers
             leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("公务舱"));
             if (leftBindData != null)
             {
-                
+
                 designer.SetDataSource("JPGWCCB", leftBindData.cb);
                 designer.SetDataSource("JPGWCPNum", leftBindData.rs);
                 designer.SetDataSource("JPGWCXS", leftBindData.xs);
@@ -7234,7 +7247,7 @@ namespace OASystem.API.Controllers
                 hideRowsList.Add(Row + startIndex + HideRows);
                 //ws.Cells.HideRows((Row + startIndex + HideRows), 2);
             }
-            
+
 
             HideRows += 2;
             leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("公务单人"));
@@ -7286,7 +7299,7 @@ namespace OASystem.API.Controllers
 
             HideRows += 4;
             var rightBindData = right.rightInfoNumber.Find(x => x.title.Contains("经济舱 TBR"));
-            if (rightBindData!= null)
+            if (rightBindData != null)
             {
                 //经济舱 + 双人间 TBR
                 designer.SetDataSource("lblJJCTBRDRCB", rightBindData.cb);
@@ -7475,7 +7488,7 @@ namespace OASystem.API.Controllers
                 leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("经济舱"));
                 if (leftBindData != null)
                 {
-                   
+
                     designer.SetDataSource("BJPJJCCB", leftBindData.cb);
                     designer.SetDataSource("BJPJJCPnum", leftBindData.rs);
                     designer.SetDataSource("BJPJJCXS", leftBindData.xs);
@@ -7606,7 +7619,7 @@ namespace OASystem.API.Controllers
                     designer.SetDataSource("BGWDRLR", decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs) - decimal.Parse(leftBindData.cb));
                     designer.SetDataSource("BGWZLR", ((decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs)) - decimal.Parse(leftBindData.cb)) * decimal.Parse(leftBindData.rs));
                 }
-                   
+
 
                 #region 优化方案
                 //Dictionary<string, object> excelBind = new Dictionary<string, object>();
@@ -7634,14 +7647,14 @@ namespace OASystem.API.Controllers
 
                 #region B段Right信息
 
-                 right = dto.rightInfo.Find(x => x.Type == "B");
+                right = dto.rightInfo.Find(x => x.Type == "B");
                 if (right == null)
                 {
                     return Ok(jw);
                 }
 
                 rightBindData = right.rightInfoNumber.Find(x => x.title.Contains("经济舱 TBR"));
-                if (rightBindData!= null)
+                if (rightBindData != null)
                 {
                     //经济舱 + 双人间 TBR
                     designer.SetDataSource("BlblJJCTBRDRCB", rightBindData.cb);
@@ -7963,7 +7976,7 @@ namespace OASystem.API.Controllers
                             continue;
                         }
 
-                        TzAirDesc += "(" + index + ".) "+item+"    " + (decimal.Parse(Ainfo.cb) * decimal.Parse(Ainfo.xs)).ToString("#0.00") + "/人  共" + Ainfo.rs + "  ........小计RMB  " + (decimal.Parse(Ainfo.cb) * decimal.Parse(Ainfo.xs) * decimal.Parse(Ainfo.rs)).ToString("#0.00") + "\n";
+                        TzAirDesc += "(" + index + ".) " + item + "    " + (decimal.Parse(Ainfo.cb) * decimal.Parse(Ainfo.xs)).ToString("#0.00") + "/人  共" + Ainfo.rs + "  ........小计RMB  " + (decimal.Parse(Ainfo.cb) * decimal.Parse(Ainfo.xs) * decimal.Parse(Ainfo.rs)).ToString("#0.00") + "\n";
                         index++;
                     }
                 }
@@ -8162,13 +8175,13 @@ namespace OASystem.API.Controllers
                         }
                     }
                 }
-                
+
                 GroupCostModulePromptView _view = new GroupCostModulePromptView();
-;
+                ;
                 List<GroupCostModulePromptInfo> _ModulePromptInfos = new List<GroupCostModulePromptInfo>(); //机票存储多段
 
                 //op,酒店单段模式存储
-                GroupCostModulePromptInfo _ModulePromptInfo = new GroupCostModulePromptInfo() 
+                GroupCostModulePromptInfo _ModulePromptInfo = new GroupCostModulePromptInfo()
                 {
                     CurrencyCode = _GroupCostParameters[0].Currency,
                     Rate = _GroupCostParameters[0].Rate,
@@ -8214,7 +8227,7 @@ namespace OASystem.API.Controllers
                     if (_GroupCostParameters.Count > 1)
                     {
                         modulePromptInfo.CostTypeNumber = item.CostTypenumber;
-                       
+
                     }
                     else
                     {
@@ -8227,14 +8240,14 @@ namespace OASystem.API.Controllers
                         modulePromptInfo.TotalCost = item.DJCB;
                     }
 
-                    List<string> costTypes = new List<string>() { "A","B" };
+                    List<string> costTypes = new List<string>() { "A", "B" };
 
                     List<Grp_GroupCost> _GroupCostsTypeData = new List<Grp_GroupCost>();
                     var _GroupCostsDuplicates = _GroupCostParameters.GroupBy(x => x.CostType).Select(y => y.FirstOrDefault());
                     if (_GroupCostsDuplicates.Count() == 1)
                     {
                         _GroupCostsTypeData = _GroupCosts;
-                        
+
                     }
                     else
                     {
@@ -8279,7 +8292,7 @@ namespace OASystem.API.Controllers
                                 {
                                     Date = it.Date,  //日期
                                     CarFee = (it.CarCost + it.CFM + it.CFOF) * _rate * _scale, //车费用
-                                    GuideFee = (it.TGS + it.TGOF + it.TGM+ it.TGA + it.TGTF + it.TGEF) * _rate * _scale, //导游费用
+                                    GuideFee = (it.TGS + it.TGOF + it.TGM + it.TGA + it.TGTF + it.TGEF) * _rate * _scale, //导游费用
                                     MealFee = (it.B + it.L + it.D) * _rate * _scale,  //餐食费
                                     TicketFee = it.EF * _rate * _scale,  //门票费 
                                     TipFee = (it.TGTips + it.DRVTips) * _rate * _scale, //小费
@@ -8331,10 +8344,10 @@ namespace OASystem.API.Controllers
                     _ModulePromptInfo.Data = _ModuleSubPromptInfo;
                     _ModulePromptInfos.Add(_ModulePromptInfo);
                 }
-                
+
                 _view.ModulePromptInfos = _ModulePromptInfos;
 
-                return Ok(JsonView(true,"操作成功!", _view));
+                return Ok(JsonView(true, "操作成功!", _view));
             }
             catch (Exception ex)
             {
@@ -8954,7 +8967,7 @@ namespace OASystem.API.Controllers
                 {
                     return Ok(JsonView(false, _view.Msg));
                 }
-                
+
                 return Ok(JsonView(true, _view.Msg, _view.Data));
             }
             catch (Exception ex)
@@ -9006,7 +9019,7 @@ namespace OASystem.API.Controllers
             }
             catch (Exception ex)
             {
-                return Ok(JsonView(false, "Catch："+ex.Message));
+                return Ok(JsonView(false, "Catch：" + ex.Message));
             }
         }
 
@@ -9089,7 +9102,7 @@ namespace OASystem.API.Controllers
 
                 #endregion
 
-                Result data = await _hotelPriceRep._Details(_dto.PortType,_dto.Id);
+                Result data = await _hotelPriceRep._Details(_dto.PortType, _dto.Id);
                 if (data.Code != 0)
                 {
                     return Ok(JsonView(false, data.Msg));
@@ -9131,9 +9144,9 @@ namespace OASystem.API.Controllers
 
                 if (_dto.Id == 0) // Add
                     if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
-                else if (_dto.Id > 0) // Edit
-                    if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
-                else return Ok(JsonView(false, "请输入正确的数据Id!"));
+                    else if (_dto.Id > 0) // Edit
+                        if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
+                        else return Ok(JsonView(false, "请输入正确的数据Id!"));
 
                 #endregion
 
@@ -9360,7 +9373,7 @@ namespace OASystem.API.Controllers
                             }
                             if (clientIds_int.Count > 0)
                             {
-                                var _clientDatas =  _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0 && clientIds_int.Contains(it.Id)).ToList();
+                                var _clientDatas = _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0 && clientIds_int.Contains(it.Id)).ToList();
                                 foreach (var client in _clientDatas)
                                 {
                                     //男
@@ -9368,9 +9381,9 @@ namespace OASystem.API.Controllers
                                     //女
                                     else if (client.Sex == 1) guestName += $"Ms.";
 
-                                    if (!String.IsNullOrEmpty(client.FirstName+ client.LastName))
+                                    if (!String.IsNullOrEmpty(client.FirstName + client.LastName))
                                     {
-                                        guestName += $"{string.Join("",client.FirstName.GetTotalPingYin()).ToUpper()} {string.Join("", client.LastName.GetTotalPingYin()).ToUpper()},";
+                                        guestName += $"{string.Join("", client.FirstName.GetTotalPingYin()).ToUpper()} {string.Join("", client.LastName.GetTotalPingYin()).ToUpper()},";
                                     }
 
                                     //guestName += $"{client.Pinyin},";
@@ -9463,7 +9476,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, ex.Message));
             }
 
-           
+
 
         }
 
@@ -9596,11 +9609,11 @@ namespace OASystem.API.Controllers
                     tableOne.Rows.RemoveAt(dt.Rows.Count + 1);
                 }
                 string strFileName = di.TeamName + "酒店确认单.doc";
-               
+
                 doc.Save(AppSettingsHelper.Get("WordBasePath") + "HotelStatement/" + strFileName);
                 string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/HotelStatement/" + strFileName;
                 return Ok(JsonView(true, "成功", url));
-                
+
             }
             catch (Exception ex)
             {
@@ -9963,7 +9976,7 @@ namespace OASystem.API.Controllers
 
             #endregion
 
-            var viewData = await _tourClientListRep._ItemByDiId(_dto.PortType,_dto.DiId);
+            var viewData = await _tourClientListRep._ItemByDiId(_dto.PortType, _dto.DiId);
             if (viewData.Code != 0)
             {
                 return Ok(JsonView(false, viewData.Msg));
@@ -10062,7 +10075,8 @@ namespace OASystem.API.Controllers
             if (_dto.Id == 0) //添加
             {
                 if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
-            }else if (_dto.Id >= 0) //修改
+            }
+            else if (_dto.Id >= 0) //修改
             {
                 if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
             }
@@ -10099,9 +10113,9 @@ namespace OASystem.API.Controllers
             #region 页面操作权限验证
             pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
 
-           
+
             if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
-           
+
 
             #endregion
 
@@ -10188,13 +10202,17 @@ namespace OASystem.API.Controllers
 	                                                   Left Join Crm_CustomerCert cc2 On dc.Id = cc2.DcId And cc2.SdId = 774 And cc2.IsDel = 0
 	                                                   Where dc.IsDel = 0) temp 
                                                On temp.DcId =tcl.ClientId  
-                                               Where tcl.IsDel = 0 And tcl.DiId = {0}",_dto.DiId);
+                                               Where tcl.IsDel = 0 And tcl.DiId = {0}", _dto.DiId);
             List<TourClientListDetailsView> DcList = await _sqlSugar.SqlQueryable<TourClientListDetailsView>(clientSql).ToListAsync();
 
             if (DcList.Count < 0) return Ok(JsonView(false, "该团未录入客户名单!"));
 
             //载入模板
             string tempPath = AppSettingsHelper.Get("WordBasePath") + "Template/dwon_团组人员列表模板.doc";
+            if (_dto.Language == 1)
+            {
+                tempPath = AppSettingsHelper.Get("WordBasePath") + "Template/EN_Down_团组人员列表模板.doc";
+            }
 
             //载入模板
             var doc = new Document(tempPath);
@@ -10208,36 +10226,114 @@ namespace OASystem.API.Controllers
 
             var rowStart = tableOne.Rows[0]; //获取第1行
 
-            //循环赋值
-            for (int i = 0; i < DcList.Count; i++)
+            if (_dto.Language == 0)
             {
-                builder.MoveToCell(0, i + 1, 0, 0);
-                builder.Write(DcList[i].LastName + DcList[i].FirstName);
+                //循环赋值
+                for (int i = 0; i < DcList.Count; i++)
+                {
+                    builder.MoveToCell(0, i + 1, 0, 0);
+                    builder.Write(DcList[i].LastName + DcList[i].FirstName);
 
-                builder.MoveToCell(0, i + 1, 1, 0);
-                int sex = DcList[i].Sex;
-                string sexStr = string.Empty;
-                if (sex == 0) sexStr = "男";
-                else if (sex == 1) sexStr = "女";
-                else sexStr = "未设置";
-                builder.Write(sexStr);
+                    builder.MoveToCell(0, i + 1, 1, 0);
+                    int sex = DcList[i].Sex;
+                    string sexStr = string.Empty;
+                    if (sex == 0) sexStr = "男";
+                    else if (sex == 1) sexStr = "女";
+                    else sexStr = "未设置";
+                    builder.Write(sexStr);
 
-                builder.MoveToCell(0, i + 1, 2, 0);
-                string birthDay = DcList[i].BirthDay;
-                string birthDayStr = string.Empty;
-                if (!string.IsNullOrEmpty(birthDay))
-                {
-                    birthDayStr = Convert.ToDateTime(birthDay).ToString("yyyy-MM-dd");
-                }
-                builder.Write(birthDayStr);
+                    builder.MoveToCell(0, i + 1, 2, 0);
+                    string birthDay = DcList[i].BirthDay;
+                    string birthDayStr = string.Empty;
+                    if (!string.IsNullOrEmpty(birthDay))
+                    {
+                        birthDayStr = Convert.ToDateTime(birthDay).ToString("yyyy-MM-dd");
+                    }
+                    builder.Write(birthDayStr);
 
-                builder.MoveToCell(0, i + 1, 3, 0);
-                builder.Write(DcList[i].CompanyFullName);
+                    builder.MoveToCell(0, i + 1, 3, 0);
+                    builder.Write(DcList[i].CompanyFullName);
+
+                    builder.MoveToCell(0, i + 1, 4, 0);
+                    builder.Write(DcList[i].Job);
+                }
 
-                builder.MoveToCell(0, i + 1, 4, 0);
-                builder.Write(DcList[i].Job);
             }
+            else if (_dto.Language == 1)
+            {
+                List<Res_PositionEnglishComparison> listPEC = _setDataRep.Query<Res_PositionEnglishComparison>(s => s.IsDel == 0).ToList();
+                List<Res_CompanyEnglishComparison> listCEC = _setDataRep.Query<Res_CompanyEnglishComparison>(s => s.IsDel == 0).ToList();
+
+                //循环赋值
+                for (int i = 0; i < DcList.Count; i++)
+                {
+                    string PY_Last = DcList[i].Pinyin.Split('/')[0];
+                    string PY_First = DcList[i].Pinyin.Split('/')[1];
+                    string PYName = PY_First + " " + PY_Last;
+                    builder.MoveToCell(0, i + 1, 0, 0);
+                    builder.Write(PYName);
+
+                    string sex = DcList[i].Sex == 0 ? "Male" : DcList[i].Sex == 1 ? "Female" : "";
+                    builder.MoveToCell(0, i + 1, 1, 0);
+                    builder.Write(sex);
 
+                    DateTime birthDt;
+                    bool b_birth = DateTime.TryParse(DcList[i].BirthDay, out birthDt);
+                    string birthday = b_birth ? birthDt.ToString("yyyy-MM-dd") : "";
+                    builder.MoveToCell(0, i + 1, 2, 0);
+                    builder.Write(birthday);
+
+                    string company = "";
+                    try
+                    {
+                        if (!string.IsNullOrEmpty(DcList[i].CompanyFullName.ToString()))
+                        {
+                            //查询对照表
+                            Res_CompanyEnglishComparison tempCec = listCEC.FirstOrDefault(s => s.zhName.Contains(DcList[i].CompanyFullName.ToString().Trim()));
+                            if (tempCec != null)
+                            {
+                                company = tempCec.enName;
+                            }
+                            //翻译
+                            else
+                            {
+                                company = await YouDaoApiTools.GetOCR_ReTrans(DcList[i].CompanyFullName.ToString().Trim());
+                            }
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    builder.MoveToCell(0, i + 1, 3, 0);
+                    builder.Write(company);
+
+                    string job = "";
+                    try
+                    {
+                        if (!string.IsNullOrEmpty(DcList[i].Job.ToString()))
+                        {
+                            //查询对照表
+                            Res_PositionEnglishComparison tempPec = listPEC.FirstOrDefault(s => s.zhName == DcList[i].Job.ToString().Trim());
+                            if (tempPec != null)
+                            {
+                                job = tempPec.enName;
+                            }
+                            //翻译
+                            else
+                            {
+                                job = await YouDaoApiTools.GetOCR_ReTrans(DcList[i].Job.ToString().Trim());
+                            }
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    builder.MoveToCell(0, i + 1, 4, 0);
+                    builder.Write(job);
+                }
+            }
 
             //删除多余行
             while (tableOne.Rows.Count > DcList.Count + 1)
@@ -10306,7 +10402,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostInvertedListCreate(InvertedListCreateDto dto)
         {
-            var viewData = await _invertedListRep._Create(dto.PortType,dto.DiId);
+            var viewData = await _invertedListRep._Create(dto.PortType, dto.DiId);
             if (viewData.Code != 0)
             {
                 return Ok(JsonView(false, viewData.Msg));
@@ -10402,7 +10498,7 @@ namespace OASystem.API.Controllers
             #endregion
 
             var fileDir = AppSettingsHelper.Get("WordBasePath");
-            string fileName = $"{teamName}团出行准备流程表.doc";  
+            string fileName = $"{teamName}团出行准备流程表.doc";
             string filePath = fileDir + $@"InvertedList/{fileName}";
             doc.Save(filePath);
             string Url = $@"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/InvertedList/{fileName}";

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1473,7 +1473,7 @@ namespace OASystem.API.Controllers
                         adds.Add(new Sys_JobPostAuthority
                         {
                             CreateTime = DateTime.Now,
-                            CreateUserId = 245,
+                            CreateUserId = dto.UserId,
                             FId = fid,
                             JpId = dto.Jpid,
                             SmId = item.SmId
@@ -1518,7 +1518,7 @@ namespace OASystem.API.Controllers
                         userAuth = adds.Select(x=> new Sys_UserAuthority
                         {
                             CreateTime = DateTime.Now,
-                            CreateUserId = 235,
+                            CreateUserId = dto.UserId,
                             FId = x.FId,
                             SmId = x.SmId,
                             UId = user.Id,
@@ -1624,7 +1624,7 @@ namespace OASystem.API.Controllers
                         adds.Add(new Sys_UserAuthority
                         {
                             CreateTime = DateTime.Now,
-                            CreateUserId = 235,
+                            CreateUserId = dto.UserId,
                             FId = fid,
                             UId = dto.uid,
                             SmId = item.SmId,
@@ -1644,7 +1644,7 @@ namespace OASystem.API.Controllers
                 userAuth = adds.Select(x => new Sys_UserAuthority
                 {
                     CreateTime = DateTime.Now,
-                    CreateUserId = 235,
+                    CreateUserId = dto.UserId,
                     FId = x.FId,
                     SmId = x.SmId,
                     UId = dto.uid,
@@ -1694,7 +1694,7 @@ namespace OASystem.API.Controllers
 
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> EditPageInfo(SetDataAndPageInfoView dto)
+        public async Task<IActionResult> EditPageInfo(SetDataAndPageInfoDto dto)
         {
             JsonView view = null;
             _SystemMenuPermissionRepository.BeginTran();
@@ -1707,7 +1707,7 @@ namespace OASystem.API.Controllers
                 IosUrl = dto.IosUrl,
                 Name = dto.PageName,
                 PhoneIsEnable = dto.PagePhoneIsEnable,
-                CreateUserId = 235,
+                CreateUserId = dto.UserId,
                 IsDel = 0,
                 IsEnable = dto.PageIsEnable,
                 Mid = dto.Modulid,
@@ -1729,7 +1729,7 @@ namespace OASystem.API.Controllers
                     binFun.Add(new Sys_SystemMenuAndFunction
                     {
                         CreateTime = DateTime.Now,
-                        CreateUserId = 235,
+                        CreateUserId = dto.UserId,
                         FId = item,
                         SmId = dto.Pageid,
                         IsDel = 0,
@@ -1756,7 +1756,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> AddPageInfo(SetDataAndPageInfoView dto)
+        public async Task<IActionResult> AddPageInfo(SetDataAndPageInfoDto dto)
         {
             JsonView view = null;
 
@@ -1770,7 +1770,7 @@ namespace OASystem.API.Controllers
                 IosUrl = dto.IosUrl,
                 Name = dto.PageName,
                 PhoneIsEnable = dto.PagePhoneIsEnable,
-                CreateUserId = 235,
+                CreateUserId = dto.UserId,
                 IsDel = 0,
                 IsEnable = dto.PageIsEnable,
                 Mid = dto.Modulid,
@@ -1786,7 +1786,7 @@ namespace OASystem.API.Controllers
                 binFun.Add(new Sys_SystemMenuAndFunction
                 {
                     CreateTime = DateTime.Now,
-                    CreateUserId = 235,
+                    CreateUserId = dto.UserId,
                     FId = item,
                     SmId = number,
                     IsDel = 0,

OASystem/OASystem.Domain/Dtos/Groups/TourClientListDto.cs

@@ -318,5 +318,11 @@ namespace OASystem.Domain.Dtos.Groups
     public class PostTourClientListDownloadFile: UserPageFuncDtoBase
     {
         public int DiId { get; set; }
+
+
+        /// <summary>
+        /// 语言 0:中文，1：英文
+        /// </summary>
+        public int Language { get; set; } = 0;
     }
 }

OASystem/OASystem.Domain/Dtos/System/SaveJobDto.cs

@@ -14,6 +14,7 @@ namespace OASystem.Domain.Dtos.System
         public int Jpid { get; set; }
         public List<savejob> Savejobs { get; set; }
         public int modulId { get; set; }
+        public int UserId { get; set; }
     }
 
     public class SaveUserDto
@@ -25,6 +26,8 @@ namespace OASystem.Domain.Dtos.System
         public List<savejob> Savejobs { get; set; }
 
         public int Modulid { get; set; }
+
+        public int UserId {  get; set; }
     }
 
     public class savejob

OASystem/OASystem.Domain/Entities/Resource/Res_CompanyEnglishComparison.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+    /// <summary>
+    /// 单位机构中英对照表
+    /// </summary>
+    [SugarTable("Res_CompanyEnglishComparison")]
+    public class Res_CompanyEnglishComparison: EntityBase
+    {
+        /// <summary>
+        /// 中文名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string zhName { get; set; }
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(500)")]
+        public string enName { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Resource/Res_PositionEnglishComparison.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+
+    /// <summary>
+    /// 职务中英对照表
+    /// </summary>
+    [SugarTable("Res_PositionEnglishComparison")]
+    public class Res_PositionEnglishComparison:EntityBase
+    {
+        /// <summary>
+        /// 中文名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string zhName { get; set; }
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string enName { get; set; }
+    }
+}

OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -135,6 +135,76 @@ namespace OASystem.Domain.ViewModels.System
         public List<int> FunArr { get; set; }
     }
 
+
+    public class SetDataAndPageInfoDto
+    {
+        /// <summary>
+        /// 模块id
+        /// </summary>
+        public int Modulid { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ModulName { get; set; }
+        /// <summary>
+        /// setdatatype id
+        /// </summary>
+        public int STid { get; set; }
+        /// <summary>
+        /// 模块备注
+        /// </summary>
+        public string ModulRemark { get; set; }
+
+        /// <summary>
+        /// 页面id
+        /// </summary>
+        public int Pageid { get; set; }
+
+        /// <summary>
+        /// 页面名称
+        /// </summary>
+        public string PageName { get; set; }
+
+        /// <summary>
+        /// 页面是否启用
+        /// </summary>
+        public int PageIsEnable { get; set; }
+
+
+        public int PagePhoneIsEnable { get; set; }
+
+        /// <summary>
+        /// 页面Code
+        /// </summary>
+        public string SystemMenuCode { get; set; }
+
+        public string WebUrl { get; set; }
+
+        public string AndroidUrl { get; set; }
+
+        public string IosUrl { get; set; }
+
+        /// <summary>
+        /// 手机端图标
+        /// </summary>
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 页面备注
+        /// </summary>
+        public string PageRemark { get; set; }
+
+        /// <summary>
+        /// 页面添加的操作
+        /// </summary>
+        public List<int> FunArr { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public int UserId { get; set; }
+    }
+
     public class SetDataIView:Sys_SetData
     {
         public string StName { get; set; }

OASystem/OASystem.Infrastructure/Repositories/CRM/NewClientDataRepository.cs

@@ -47,9 +47,11 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 #region 下拉框初始化数据
                 //负责人下拉框
                 List<dynamic> _Users = new List<dynamic>();
-                List<Sys_Users> users = _sqlSugar.Queryable<Sys_Users>().Where(u => u.IsDel == 0 && u.CompanyId == 2).ToList();
+                List<Sys_Users> users = _sqlSugar.Queryable<Sys_Users>().Where(u => u.IsDel == 0 
+                //&& u.CompanyId == 2
+                ).ToList();
 
-                foreach (Sys_Users user in users)
+                foreach (Sys_Users user in users)   
                 {
                     var data = new
                     {

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -872,11 +872,30 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                 }
 
+                Regex regex = new Regex("^[\u4e00-\u9fa5]{0,}$");
+
                 //修改C表数据
                 //List<Grp_CarTouristGuideGroundReservationsContent> carTouristListEnd = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservationsContent>().Where(a=>a.DiId==dto.DiId && a.CTGGRId==dto.CTGGRId && a.IsDel==0).ToList();
                 Grp_CreditCardPayment c = new Grp_CreditCardPayment();
                 c.PaymentCurrency = dto.Currency;
-                c.PayMoney = carTouristList.Sum(x => x.Price * x.Count);
+
+                for (int i = 0; i < dto.SelectCheck.Count; i++) {
+                    if (!regex.IsMatch(dto.SelectCheck[i]))
+                    {
+                        for(int j = 0; j < carTouristList.Count; j++)
+                        {
+                            if (int.Parse(dto.SelectCheck[i]) == carTouristList[j].SId)
+                            {
+                                c.PayMoney += carTouristList[j].Price * carTouristList[j].Count;
+                            }
+                        }
+                    } else
+                    {
+                        c.PayMoney = carTouristList.Sum(x => x.Price * x.Count);
+                        break;
+                    }
+                }
+
                 c.PayPercentage = dto.PayPercentage;
                 c.ConsumptionDate= DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                 c.CTable = 79;

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -77,6 +77,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         invitation.Email = res_InvitationOfficialActivityData.Email;
                         invitation.Fax = res_InvitationOfficialActivityData.Fax;
                         invitation.OtherInformation = res_InvitationOfficialActivityData.Remark;
+                        invitation.CTDId = grp_CreditCard.CTDId;
                         result = new Result() { Code = 0, Msg = "查询成功！", Data = invitation };
                     }
                 }