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

OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -67,12 +67,12 @@ namespace OASystem.API.Controllers
                     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> 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> listBeiZhu = new List<string>() { "备注" };
+                    List<string> listBeiZhu = new List<string>() { "备注", "本团职务" };
 
                     for (int i = 0; i < headerList.Count; i++)
                     {

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -396,12 +396,14 @@ namespace OASystem.API.Controllers
                 #region 酒店预定费用
                 List<GroupHotelFeeView> groupHotelFeeViews = new List<GroupHotelFeeView>();
 
+                //ccp.RMBPrice As CNYPrice
+                //(((ccp.PayMoney * ccp.DayRate) / ccp.PayPercentage) * 100) As CNYPrice
                 string hotelFeeSql = string.Format(@"Select hr.Id As HrId,hr.DiId As HrDiId,hr.City,hr.HotelName,hr.CheckInDate,hr.CheckOutDate,
                                                      sd1.Name As PaymentCurrency,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
                                                      hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,
                                                      hr.BreakfastPrice,sd4.Name As BreakfastCurrency,hr.Isoppay,hr.GovernmentRent,
                                                      sd5.Name As GovernmentRentCurrency,hr.CityTax,sd6.Name As CityTaxCurrency,
-                                                     ccp.PayMoney,ccp.RMBPrice As CNYPrice,ccp.DayRate,ccp.Payee,ccp.OrbitalPrivateTransfer,
+                                                     ccp.PayMoney,(((ccp.PayMoney * ccp.DayRate) / ccp.PayPercentage) * 100) As CNYPrice,ccp.DayRate,ccp.Payee,ccp.OrbitalPrivateTransfer,
                                                      sd2.Name As PayWay,sd3.Name As CardType,ccp.IsPay,u.CnName As Applicant
                                                      From Grp_HotelReservations  hr
                                                      Left Join Grp_CreditCardPayment ccp On hr.Id = ccp.CId
@@ -537,11 +539,12 @@ namespace OASystem.API.Controllers
                 #endregion
 
                 #region 机票预订费用
-
+                //(((ccp.PayMoney * ccp.DayRate) / ccp.PayPercentage) * 100) As CNYPrice
+                //ccp.RMBPrice As CNYPrice
                 List<GroupAirFeeView> groupAirFeeViews = new List<GroupAirFeeView>();
                 string groupAirFeeSql = string.Format(@"Select atr.Id As AirId,atr.DIId As AirDiId,atr.FlightsCode,atr.FlightsCity,sd4.Name As AirTypeName,
                                                         atr.FlightsDate,atr.FlightsTime,atr.ClientName,atr.ClientNum,ccp.PayMoney,
-                                                        sd1.Name As PayMoneyCurrency,ccp.RMBPrice As CNYPrice,ccp.DayRate,ccp.Payee,ccp.AuditGMDate,
+                                                        sd1.Name As PayMoneyCurrency,(((ccp.PayMoney * ccp.DayRate) / ccp.PayPercentage) * 100) As CNYPrice,ccp.DayRate,ccp.Payee,ccp.AuditGMDate,
                                                         ccp.OrbitalPrivateTransfer,sd2.Name As PayWay,sd3.Name As CardType,ccp.IsPay,u.CnName As Applicant,atr.CreateTime,
                                                         atr.CType
                                                         From Grp_AirTicketReservations atr
@@ -754,7 +757,8 @@ namespace OASystem.API.Controllers
                 List<GroupVisaFeeView> groupVisaFeeViews = new List<GroupVisaFeeView>();
                 string groupVisaFeeSql = string.Format(@"Select vi.Id As VisaId,vi.DIId As VisaDiId,vi.VisaClient,ccp.PayMoney,sd1.Name As PayMoneyCurrency,
                                                          ccp.DayRate,ccp.Payee,ccp.AuditGMDate,ccp.OrbitalPrivateTransfer,sd2.Name As PayWay,
-                                                         sd3.Name As CardTypeName,ccp.IsPay,u.CnName As Applicant,vi.CreateTime
+                                                         sd3.Name As CardTypeName,ccp.IsPay,u.CnName As Applicant,vi.CreateTime,
+(((ccp.PayMoney * ccp.DayRate) / ccp.PayPercentage) * 100) As CNYPrice
                                                          From Grp_VisaInfo vi
                                                          Left Join Grp_CreditCardPayment ccp On ccp.isdel = 0 And ccp.CTable = 80 And vi.Id = ccp.CId
                                                          Left Join Sys_SetData sd1 On ccp.PaymentCurrency = sd1.Id
@@ -773,15 +777,6 @@ namespace OASystem.API.Controllers
                     string visaClients = item.VisaClient;
                     if (!string.IsNullOrEmpty(visaClients))
                     {
-                        System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.VisaClient, @"[A-Za-z]+");
-                        System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.VisaClient, @"[\u4e00-\u9fa5]");
-
-                        if (m_EnName.Success || m_ZHName.Success)
-                        {
-                            itemClientName = visaClients;
-                            continue;
-                        }
-
                         string[] clientIds = new string[] { };
                         if (visaClients.Contains(','))
                         {
@@ -821,7 +816,7 @@ namespace OASystem.API.Controllers
                         itemClientName = itemClientName.Substring(0, itemClientName.Length - 1);
                     }
                     item.VisaClient = itemClientName;
-                    VisaCNYTotalPirce += item.PayMoney;
+                    VisaCNYTotalPirce += item.CNYPrice;
                     if (!string.IsNullOrEmpty(item.AuditGMDate))
                     {
                         item.AuditGMDate = Convert.ToDateTime(item.AuditGMDate).ToString("yyyy-MM-dd HH:mm:ss");
@@ -829,7 +824,7 @@ namespace OASystem.API.Controllers
                 }
 
                 _geView.GroupVisaFeeViews = groupVisaFeeViews;
-                _geView.GroupVisaFeeStr = string.Format(@"人民币总费用：{0} CNY", VisaCNYTotalPirce.ConvertToDecimal1());
+                _geView.GroupVisaFeeStr = string.Format(@"人民币总费用：{0} CNY", VisaCNYTotalPirce.ConvertToDecimal1().ToString("#.00"));
                 #endregion
 
                 #region 邀请/公务活动  CTable = 81
@@ -838,7 +833,7 @@ namespace OASystem.API.Controllers
                 string groupInvitationalFeeSql = string.Format(@"Select ioa.Id As IOAId,ioa.DiId As IOADiId,ioa.InviterArea,ioa.Inviter,ioa.InviteTime,
                                                                  ioa.InviteCost,sd3.Name As InviteCurrency,ioa.SendCost,sd4.Name As SendCurrency,ioa.EventsCost,
                                                                  sd5.Name As EventsCurrency,ioa.TranslateCost,sd6.Name As TranslateCurrency,ccp.PayMoney,
-                                                                 sd7.Name As PaymentCurrency,ccp.RMBPrice As CNYPrice,ccp.Payee,ccp.AuditGMDate,
+                                                                 sd7.Name As PaymentCurrency,ccp.RMBPrice As CNYPrice,(((ccp.PayMoney * ccp.DayRate) / ccp.PayPercentage) * 100) As CNYPrice2,ccp.Payee,ccp.AuditGMDate,
                                                                  ccp.OrbitalPrivateTransfer,sd2.Name As PayWay,ccp.IsPay,u.CnName As Applicant,ioa.CreateTime
                                                                  From  Grp_InvitationOfficialActivities ioa
                                                                  Left Join Grp_CreditCardPayment ccp On ccp.isdel = 0 And ccp.CTable = 81 And ioa.Id = ccp.CId
@@ -914,7 +909,7 @@ namespace OASystem.API.Controllers
 
                 foreach (var item in groupInvitationalFeeViews)
                 {
-                    InvitationalCNYTotalPrice += item.CNYPrice;
+                    InvitationalCNYTotalPrice += item.CNYPrice2;
 
                     if (!string.IsNullOrEmpty(item.AuditGMDate))
                     {
@@ -935,7 +930,7 @@ namespace OASystem.API.Controllers
                 }
 
                 _geView.GroupInvitationalFeeViews = groupInvitationalFeeViews;
-                _geView.GroupInvitationalFeeStr = string.Format(@"人民币总费用：{0} CNY", InvitationalCNYTotalPrice);
+                _geView.GroupInvitationalFeeStr = string.Format(@"人民币总费用：{0} CNY", InvitationalCNYTotalPrice.ToString("#.00"));
                 #endregion
 
                 #region 保险费用
@@ -960,14 +955,14 @@ namespace OASystem.API.Controllers
                     string insClients = item.ClientName;
                     if (!string.IsNullOrEmpty(insClients))
                     {
-                        System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.ClientName, @"[A-Za-z]+");
-                        System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.ClientName, @"[\u4e00-\u9fa5]");
-
-                        if (m_EnName.Success || m_ZHName.Success)
-                        {
-                            itemClientName = insClients;
-                            continue;
-                        }
+                        //System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.ClientName, @"[A-Za-z]+");
+                        //System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.ClientName, @"[\u4e00-\u9fa5]");
+
+                        //if (m_EnName.Success || m_ZHName.Success)
+                        //{
+                        //    itemClientName = insClients;
+                        //    continue;
+                        //}
 
                         string[] clientIds = new string[] { };
                         if (insClients.Contains(','))

OASystem/OASystem.Domain/ViewModels/Statistics/GroupStatementView.cs

@@ -933,6 +933,11 @@ namespace OASystem.Domain.ViewModels.Statistics
         /// </summary>
         public decimal PayMoney { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 付款金额
+        /// </summary>
+        public decimal CNYPrice { get; set; } = 0.00M;
+
         /// <summary>
         /// 付款币种
         /// </summary>
@@ -1059,6 +1064,13 @@ namespace OASystem.Domain.ViewModels.Statistics
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 
+
+        /// <summary>
+        /// 人民币费用(后台计算)
+        /// </summary>
+        public decimal CNYPrice2 { get; set; } = 0.00M;
+        
+
         /// <summary>
         /// 当时币种汇率
         /// </summary>