2024.3.15问题修改

OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -64,17 +64,17 @@ 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> listSexStr = new List<string>() { "性别", "Gender" };
+                    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>() { "身份证号码", "身份证" };
-                    List<string> listOrganizationStr = new List<string>() { "工作单位", "Organization", "单位", "所在单位及职务" };
-                    List<string> listJobStr = new List<string>() { "职务", "Title", "职位" };
-                    List<string> listMobileStr = new List<string>() { "联系电话", "Mobile" };
-                    List<string> listAgeStr = new List<string>() { "年龄", "Age" };
+                    List<string> listOrganizationStr = new List<string>() { "工作单位", "organization", "单位", "所在单位及职务" };
+                    List<string> listJobStr = new List<string>() { "职务", "title", "职位" };
+                    List<string> listMobileStr = new List<string>() { "联系电话", "mobile" };
+                    List<string> listAgeStr = new List<string>() { "年龄", "age" };
                     for (int i = 0; i < headerList.Count; i++)
                     {
-                        string words = headerList[i].words.Trim();
+                        string words = headerList[i].words.Trim().ToLower();
                         if (listNameStr.Exists(s => s == words))
                         {
                             dicHeader.Add(i, "Name");

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -410,7 +410,7 @@ namespace OASystem.API.Controllers
             //团组名称
             if (!string.IsNullOrEmpty(dto.TeamName))
             {
-                sqlWhere += string.Format(@"And TeamName Like '%{0}%'",dto.TeamName);
+                sqlWhere += string.Format(@"And TeamName Like '%{0}%'", dto.TeamName);
             }
 
             //客户名称
@@ -445,7 +445,7 @@ namespace OASystem.API.Controllers
 					                              Inner Join Sys_SetData ssd1 On gdi.TeamLevSId = ssd1.Id
 					                              Left Join Sys_Users su On gdi.JietuanOperator = su.Id
 					                              Where gdi.IsDel = 0  {1}
-				                              ) temp  ", orderbyStr , sqlWhere);
+				                              ) temp  ", orderbyStr, sqlWhere);
 
 
             RefAsync<int> total = 0;//REF和OUT不支持异步,想要真的异步这是最优解
@@ -546,12 +546,12 @@ namespace OASystem.API.Controllers
                     }
 
                 }
-                else if(dto.Status == 2)
+                else if (dto.Status == 2)
                 {
                     diId = dto.Id;
                 }
 
-                return Ok(JsonView(true,"操作成功!", diId));
+                return Ok(JsonView(true, "操作成功!", diId));
             }
             catch (Exception ex)
             {
@@ -602,7 +602,7 @@ namespace OASystem.API.Controllers
                     diId = groupData.Data;
                     await GeneralMethod.PostGroupRateAddInit(dto.UserId, diId);
                 }
-               
+
 
                 if (dto.Status == 2)
                 {
@@ -632,6 +632,53 @@ namespace OASystem.API.Controllers
             }
         }
 
+        /// <summary>
+        /// 建团添加默认工作人员团组权限测试
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostGroupAuthAddInit(int userId, int diId)
+        {
+            try
+            {
+                GeneralMethod.PostGroupAuthAddInit(userId, diId);
+
+                return Ok(JsonView(true));
+            }
+            catch (Exception ex)
+            {
+
+                Logs(ex.Message);
+                return Ok(JsonView(false, ex.Message));
+            }
+        }
+
+
+        /// <summary>
+        /// 建团添加默认币种测试
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GroupOperation11(int userId, int diId)
+        {
+            try
+            {
+                GeneralMethod.PostGroupRateAddInit(userId, diId);
+
+                return Ok(JsonView(true));
+            }
+            catch (Exception ex)
+            {
+
+                Logs(ex.Message);
+                return Ok(JsonView(false, ex.Message));
+            }
+        }
+
         /// <summary>
         /// 接团信息 操作(删除)
         /// </summary>
@@ -1164,6 +1211,8 @@ namespace OASystem.API.Controllers
 
                 Grp_CreditCardPaymentView _view = new Grp_CreditCardPaymentView();
 
+                List<SimplClientInfo> clientNameList = getSimplClientList(_dto.DiId);
+
                 #region 费用清单
                 var exp = Expressionable.Create<Grp_CreditCardPayment>();
                 exp.AndIF(_dto.AuditStatus != -1, it => it.IsAuditGM == _dto.AuditStatus);
@@ -1204,6 +1253,7 @@ namespace OASystem.API.Controllers
                 List<Grp_VisaInfo> _VisaInfos = await _groupRepository
                                                       .Query<Grp_VisaInfo>(s => s.DIId == _dto.DiId && s.IsDel == 0)
                                                       .ToListAsync();
+                
 
 
                 /*
@@ -1239,11 +1289,11 @@ namespace OASystem.API.Controllers
                 /*
                  *  285://收款退还
                  */
-                List<Fin_PaymentRefundAndOtherMoney> _PaymentRefundAndOtherMoneys= await _groupRepository
+                List<Fin_PaymentRefundAndOtherMoney> _PaymentRefundAndOtherMoneys = await _groupRepository
                                                                                 .Query<Fin_PaymentRefundAndOtherMoney>(s => s.DiId == _dto.DiId && s.IsDel == 0)
                                                                                 .ToListAsync();
 
-                
+
                 /*
                  * 币种信息
                  */
@@ -1344,15 +1394,15 @@ namespace OASystem.API.Controllers
                             Grp_HotelReservations hotelReservations = _HotelReservations.Where(s => s.Id == entity.CId).FirstOrDefault();
                             if (hotelReservations != null)
                             {
-                                string GovernmentRentCode ="",GovernmentRentName = "", CityTaxCode="",CityTaxName = "", BreakfastCode="", BreakfastName = "";
+                                string GovernmentRentCode = "", GovernmentRentName = "", CityTaxCode = "", CityTaxName = "", BreakfastCode = "", BreakfastName = "";
                                 Sys_SetData sdPaymentCurrency_GovernmentRent = currencyItems.Where(s => s.Id == hotelReservations.GovernmentRentCurrency).FirstOrDefault();
-                                if (sdPaymentCurrency_GovernmentRent!= null)
+                                if (sdPaymentCurrency_GovernmentRent != null)
                                 {
                                     GovernmentRentCode = sdPaymentCurrency_GovernmentRent.Name;
                                     GovernmentRentName = sdPaymentCurrency_GovernmentRent.Remark;
                                 }
 
-                                Sys_SetData sdPaymentCurrency_CityTax = currencyItems.Where(s => s.Id == hotelReservations.CityTaxCurrency).FirstOrDefault(); 
+                                Sys_SetData sdPaymentCurrency_CityTax = currencyItems.Where(s => s.Id == hotelReservations.CityTaxCurrency).FirstOrDefault();
                                 if (sdPaymentCurrency_CityTax != null)
                                 {
                                     CityTaxCode = sdPaymentCurrency_CityTax.Name;
@@ -1370,7 +1420,7 @@ namespace OASystem.API.Controllers
                                                           $"房间说明： {hotelReservations.Remark} <br/>" +
                                                           $"地税： {hotelReservations.GovernmentRent} {GovernmentRentCode} ({GovernmentRentName})<br/>" +
                                                           $"城市税： {hotelReservations.CityTax} {CityTaxCode} ({CityTaxName})<br/>" +
-                                                          $"酒店早餐： {hotelReservations.BreakfastPrice} {BreakfastCode} ({BreakfastName})<br/>"+
+                                                          $"酒店早餐： {hotelReservations.BreakfastPrice} {BreakfastCode} ({BreakfastName})<br/>" +
                                                           $"酒店早餐是否由地接代付： {isoppayStr}";
                                 _detail.PriceNameContent = hotelReservations.HotelName;
                             }
@@ -1385,7 +1435,7 @@ namespace OASystem.API.Controllers
                                     _detail.BusName = touristGuideGroundReservations.BusName;
                                 }
 
-                                
+
                                 _detail.PriceNameContent = touristGuideGroundReservations.Area;
 
                                 List<Grp_CarTouristGuideGroundReservationsContent> touristGuideGroundReservationsContents = _CarTouristGuideGroundReservationsContent
@@ -1421,7 +1471,7 @@ namespace OASystem.API.Controllers
                             Grp_VisaInfo visaInfo = _VisaInfos.Where(s => s.Id == entity.CId).FirstOrDefault();
                             if (visaInfo != null)
                             {
-                                _detail.PriceNameContent = visaInfo.VisaClient;
+                                _detail.PriceNameContent = getClientNameStr(clientNameList, visaInfo.VisaClient);
                                 _detail.PriceMsgContent = "备注：" + visaInfo.Remark;
                             }
 
@@ -1433,7 +1483,7 @@ namespace OASystem.API.Controllers
                             {
 
                                 string ioaCurrencyCode = "Unknown";
-                                string ioaCurrencyName= "Unknown";
+                                string ioaCurrencyName = "Unknown";
 
                                 var currencyData = currencyItems.Where(s => s.Id == invitationOfficialActivities.InviteCurrency && s.IsDel == 0).FirstOrDefault();
                                 if (currencyData != null)
@@ -1443,7 +1493,7 @@ namespace OASystem.API.Controllers
                                 }
 
                                 _detail.PriceNameContent = invitationOfficialActivities.InviterArea;
-                                _detail.PriceMsgContent = "邀请费用：" + invitationOfficialActivities.InviteCost + " "+ ioaCurrencyCode + "("+ ioaCurrencyName+ ")<br/>" +
+                                _detail.PriceMsgContent = "邀请费用：" + invitationOfficialActivities.InviteCost + " " + ioaCurrencyCode + "(" + ioaCurrencyName + ")<br/>" +
                                                           "活动费用：- <br/>" +
                                                           "备注：" + invitationOfficialActivities.Remark + "<br/>";
 
@@ -1455,7 +1505,7 @@ namespace OASystem.API.Controllers
                             Grp_Customers customers = _Customers.Where(s => s.Id == entity.Id && s.IsDel == 0).FirstOrDefault();
                             if (customers != null)
                             {
-                                _detail.PriceNameContent = customers.ClientName;
+                                _detail.PriceNameContent = getClientNameStr(clientNameList, customers.ClientName);
                                 _detail.PriceMsgContent = "备注：" + customers.Remark + "<br/>";
                             }
 
@@ -1488,7 +1538,7 @@ namespace OASystem.API.Controllers
 
                             break;
                         case 751://酒店早餐
-                          
+
                             break;
                         default:
                             break;
@@ -1588,7 +1638,7 @@ namespace OASystem.API.Controllers
                     if (strs.Count > 0)
                     {
                         decimal amountPayable = strs.Sum(it => it.AmountPayable);
-                        
+
                         decimal balancePayment = strs.Sum(it => it.BalancePayment);
                         amountPayableStr += string.Format(@"{0}{1}&nbsp;|", amountPayable.ToString("#0.00"), item.CurrencyName);
 
@@ -1600,7 +1650,7 @@ namespace OASystem.API.Controllers
                         }
                         else
                         {
-                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|","0.00", item.CurrencyName);
+                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|", "0.00", item.CurrencyName);
                         }
 
                         balancePaymentStr += string.Format(@"{0}{1}&nbsp;|", balancePayment.ToString("#0.00"), item.CurrencyName);
@@ -1699,7 +1749,7 @@ namespace OASystem.API.Controllers
                     string groupNameStr = string.Empty;
                     var groupData = groupDatas.Where(it => it.Id == creditData.DIId).FirstOrDefault();
                     if (groupData != null) groupNameStr = groupData.TeamName;
-                    
+
 
                     string creditTypeStr = string.Empty;
                     var creditTypeData = creditTypeDatas.Where(it => it.Id == creditData.CTable).FirstOrDefault();
@@ -1732,10 +1782,10 @@ namespace OASystem.API.Controllers
                         msgContent = $"[{groupNameStr}({creditTypeStr})]费用申请(金额:{CNYPrice.ToString("0.00")} CNY({creditData.PayMoney.ToString("0.00")} {creditCurrency})) {auditStr}!";
                     }
 
-                     
-                    msgDatas.Add(new {DiId = creditData.DIId, UserId = creditData.CreateUserId, MsgTitle = msgTitle, MsgContent = msgContent });
+
+                    msgDatas.Add(new { DiId = creditData.DIId, UserId = creditData.CreateUserId, MsgTitle = msgTitle, MsgContent = msgContent });
                 }
-                
+
             }
             if (rst == 0)
             {
@@ -1902,11 +1952,44 @@ namespace OASystem.API.Controllers
                 jw.Msg += "请输入正确的diid";
                 return Ok(jw);
             }
-            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}",dto.DIID);
-            var arr = _sqlSugar.SqlQueryable<SimplClientInfo>(sql).ToList();
+
+            var arr = getSimplClientList(dto.DIID);
             jw = JsonView(true, "获取成功！", arr);
 
-            return Ok(jw); 
+            return Ok(jw);
+        }
+
+        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) {
+            string result = origin;
+
+            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) {
+                    SimplClientInfo tempInfo = list.FirstOrDefault(s => s.Id == tempId);
+                    if (tempInfo != null) {
+                        if (count > 1)
+                        {
+                            result = string.Format(@"{0}{1}等{2}人", tempInfo.LastName, tempInfo.FirstName, count);
+                        }
+                        else { 
+                            result = string.Format(@"{0}{1}", tempInfo.LastName, tempInfo.FirstName);
+                        }
+                    }
+                }
+            }
+
+            return result;
         }
 
         /// <summary>

OASystem/OASystem.Api/Program.cs

@@ -49,7 +49,6 @@ builder.Services.AddControllers()
         //时间格式化响应
         options.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
 
-
         ////decimal 四位小数
         //options.JsonSerializerOptions.Converters.Add(new JsonConverterDecimal(0.0000M));
     });

OASystem/OASystem.Domain/Entities/EntityBase.cs

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

OASystem/OASystem.Domain/Entities/Groups/Grp_CarTouristGuideGroundReservations.cs

@@ -51,7 +51,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// Bus描述
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(1000)")]
         public string BusDescription { get; set; }
 
         /// <summary>
@@ -75,7 +75,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 服务描述
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(1000)")]
         public string ServiceDescription { get; set; }
         /// <summary>
         /// 服务报价
@@ -90,7 +90,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 报价说明
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(1000)")]
         public string QuotedPriceExplanation { get; set; }
         /// <summary>
         /// 公转私转标识

OASystem/OASystem.Infrastructure/Repositories/Groups/TaskAssignmentRepository.cs

@@ -30,7 +30,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             {
                 //团组下拉框
                 List<dynamic> _DelegationInfos = new List<dynamic>();
-                List<Grp_DelegationInfo> grp_DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(a => a.IsDel == 0 && a.TourCode != "" && a.IsState == 0).ToList();
+                List<Grp_DelegationInfo> grp_DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(a => a.IsDel == 0 && a.TourCode != "" && a.IsState == 0).OrderByDescending(s => s.Id).ToList();
                 foreach (var Item in grp_DelegationInfos)
                 {
                     var data = new