1.员工登录 web端返回添加页面操作权限

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -189,9 +189,9 @@ namespace OASystem.API.Controllers
 
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3)
             {
-                string sql = string.Format(@"Select row_number() over(order by di.VisitStartDate Desc) as Row_Number, 
+                string sql = string.Format(@"Select row_number() over(order by di.CreateTime Desc) as Row_Number, 
 									         di.Id,di.TeamName,di.TourCode,di.ClientName,di.VisitCountry,di.VisitStartDate,
-									         di.VisitEndDate,di.VisitDays,di.VisitPNumber
+									         di.VisitEndDate,di.VisitDays,di.VisitPNumber,di.CreateTime
 									         From Grp_GroupsTaskAssignment gta
 									         Inner Join Grp_DelegationInfo di On gta.DIId = di.Id
 									         Where gta.IsDel = 0 And di.IsDel = 0 And gta.IsEnable = 1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1706,7 +1706,7 @@ namespace OASystem.API.Controllers
                         amountPayableStr += string.Format(@"{0}{1} |", amountPayable.ToString("#0.00"), item.CurrencyName);
 
                         //单独处理此次付款金额
-                        if (item.CurrencyId == 836) //人名币
+                        if (item.CurrencyId == 836) //人民币
                         {
                             decimal thisPayment = ccpCurrencyPrices.Sum(it => it.ThisPayment);
                             thisPaymentStr += string.Format(@"{0}{1} |", thisPayment.ToString("#0.00"), item.CurrencyName);
@@ -1719,7 +1719,7 @@ namespace OASystem.API.Controllers
                         balancePaymentStr += string.Format(@"{0}{1} |", balancePayment.ToString("#0.00"), item.CurrencyName);
 
                         //单独处理已审核费用
-                        if (item.CurrencyId == 836) //人名币
+                        if (item.CurrencyId == 836) //人民币
                         {
 
                             decimal auditedFunds = ccpCurrencyPrices.Sum(it => it.AuditedFunds);

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -181,7 +181,7 @@ namespace OASystem.API.Controllers
                 List<Gsd_ForeignReceivablesView> _frViews = await _sqlSugar.SqlQueryable<Gsd_ForeignReceivablesView>(_frSql).ToListAsync();
                 frTotalAmount = _frViews.Sum(it => it.ItemSumPrice);
                 _giView.Receivables = _frViews;
-                _giView.ReceivableStr = string.Format(@"应收款合计：{0} CNY(人名币)", frTotalAmount.ConvertToDecimal1().ToString("#0.00"));
+                _giView.ReceivableStr = string.Format(@"应收款合计：{0} CNY(人民币)", frTotalAmount.ConvertToDecimal1().ToString("#0.00"));
 
                 /*
                  * 已收报表
@@ -197,7 +197,7 @@ namespace OASystem.API.Controllers
                 List<Gsd_ProceedsReceivedView> _prViews = await _sqlSugar.SqlQueryable<Gsd_ProceedsReceivedView>(_prSql).ToListAsync();
                 prTotalAmount = _prViews.Sum(it => it.Price);
                 _giView.ProceedsReceivedViews = _prViews;
-                _giView.ProceedsReceivedStr = string.Format(@"已收款合计：{0} CNY(人名币)", prTotalAmount.ConvertToDecimal1().ToString("#0.00"));
+                _giView.ProceedsReceivedStr = string.Format(@"已收款合计：{0} CNY(人民币)", prTotalAmount.ConvertToDecimal1().ToString("#0.00"));
 
 
                 /*
@@ -260,7 +260,7 @@ namespace OASystem.API.Controllers
                 exTotalAmount = _ExtraCostsViews.Sum(it => it.CNYPrice);
 
                 _giView.ExtraCostsViews = _ExtraCostsViews;
-                _giView.ExtraCostsStr = string.Format(@"人名币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1().ToString("#0.00"));
+                _giView.ExtraCostsStr = string.Format(@"人民币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1().ToString("#0.00"));
                 
                 /*
                  * 收款退还
@@ -336,7 +336,7 @@ namespace OASystem.API.Controllers
                 //        DiId = 2334,
                 //        PriceName = "模拟数据-费用名称",
                 //        PayCurrencyCode = "CNY",
-                //        PayCurrencyName = "人名币",
+                //        PayCurrencyName = "人民币",
                 //        Price = 1000.00M,
                 //        CNYPrice = 1000.00M,
                 //        ThisRate = 1.00M,
@@ -353,7 +353,7 @@ namespace OASystem.API.Controllers
                 //        DiId = 2334,
                 //        PriceName = "模拟数据-费用名称",
                 //        PayCurrencyCode = "CNY",
-                //        PayCurrencyName = "人名币",
+                //        PayCurrencyName = "人民币",
                 //        Price = 1000.00M,
                 //        CNYPrice = 1000.00M,
                 //        ThisRate = 1.00M,
@@ -369,7 +369,7 @@ namespace OASystem.API.Controllers
 
                 promTotalAmount = _promView.Sum(it => it.CNYPrice);
                 _giView.PaymentRefundAndOtherMoneyViews = _promView;
-                _giView.PaymentRefundAndOtherMoneyStr = string.Format(@"人名币总费用：{0} CNY", promTotalAmount.ConvertToDecimal1().ToString("#0.00"));
+                _giView.PaymentRefundAndOtherMoneyStr = string.Format(@"人民币总费用：{0} CNY", promTotalAmount.ConvertToDecimal1().ToString("#0.00"));
 
                 decimal BalancePayment = frTotalAmount - prTotalAmount + promTotalAmount;
                 _view.GroupIncome = _giView;
@@ -426,7 +426,7 @@ namespace OASystem.API.Controllers
                 }
 
                 _geView.GroupHotelFeeViews = groupHotelFeeViews;
-                _geView.GroupHotelFeeStr = string.Format(@"人名币总费用：{0} CNY", HotelCNYTotalPrice.ToString("#0.00"));
+                _geView.GroupHotelFeeStr = string.Format(@"人民币总费用：{0} CNY", HotelCNYTotalPrice.ToString("#0.00"));
 
                 #endregion
 
@@ -464,13 +464,13 @@ namespace OASystem.API.Controllers
                         item.AuditGMDate = Convert.ToDateTime(item.AuditGMDate).ToString("yyyy-MM-dd HH:mm:ss");
                     }
 
-                    CTGGRFeeStr += string.Format(@"{0} 总费用：{1} {2}(人名币：{3} CNY 当时支付汇率：{4})\r\n", 
+                    CTGGRFeeStr += string.Format(@"{0} 总费用：{1} {2}(人民币：{3} CNY 当时支付汇率：{4})\r\n", 
                         item.Area, item.AmountPaid.ConvertToDecimal1().ToString("#0.00"), item.PaymentCurrency, item.CNYPrice.ToString("#0.0000"), item.DayRate.ToString("#0.0000"));
                     CTGGRCNYTotalPrice += item.CNYPrice;
                 }
                 _geView.GroupCTGGRFeeViews = groupCTGGRFeeViews;
 
-                _geView.GroupCTGGRFeeStr = string.Format(@"{0}人名币总费用：{1} CNY", CTGGRFeeStr,CTGGRCNYTotalPrice.ToString("#0.00"));
+                _geView.GroupCTGGRFeeStr = string.Format(@"{0}人民币总费用：{1} CNY", CTGGRFeeStr,CTGGRCNYTotalPrice.ToString("#0.00"));
                 #endregion
 
                 #region 机票预订费用
@@ -644,7 +644,7 @@ namespace OASystem.API.Controllers
                     }
                 }
 
-                _geView.GroupAirFeeStr = $@"人名币总费用：{AirCNYTotalPrice.ToString("#0.00")} CNY\r\n{str}\r\n经济舱均价为：{JJCAveragePrice.ToString("#0.00")}CNY/人;公务舱均价为：{GWCAveragePrice.ToString("#0.00")}CNY/人;";
+                _geView.GroupAirFeeStr = $@"人民币总费用：{AirCNYTotalPrice.ToString("#0.00")} CNY\r\n{str}\r\n经济舱均价为：{JJCAveragePrice.ToString("#0.00")}CNY/人;公务舱均价为：{GWCAveragePrice.ToString("#0.00")}CNY/人;";
                 #endregion
 
                 #region 签证费用
@@ -717,7 +717,7 @@ namespace OASystem.API.Controllers
                 }
 
                 _geView.GroupVisaFeeViews = groupVisaFeeViews;
-                _geView.GroupVisaFeeStr = string.Format(@"人名币总费用：{0} CNY", VisaCNYTotalPirce.ConvertToDecimal1());
+                _geView.GroupVisaFeeStr = string.Format(@"人民币总费用：{0} CNY", VisaCNYTotalPirce.ConvertToDecimal1());
                 #endregion
 
                 #region 邀请/公务活动费用  CTable = 81
@@ -898,7 +898,7 @@ namespace OASystem.API.Controllers
                     }
                 }
                 _geView.GroupInsuranceFeeViews = groupInsuranceFeeViews;
-                _geView.GroupInsuranceFeeStr = string.Format(@"人名币总费用：{0} CNY", InsuranceCNYTotalPrice.ToString("#0.00"));
+                _geView.GroupInsuranceFeeStr = string.Format(@"人民币总费用：{0} CNY", InsuranceCNYTotalPrice.ToString("#0.00"));
                 #endregion
 
                 #region 其他款项费用 
@@ -966,7 +966,7 @@ namespace OASystem.API.Controllers
                 }
 
                 _geView.GroupDecreaseFeeViews = groupDecreaseFeeViews;
-                _geView.GroupDecreaseFeeStr = string.Format(@"人名币总费用：{0} CNY", DecreaseCNYTotalPrice.ToString("#0.00"));
+                _geView.GroupDecreaseFeeStr = string.Format(@"人民币总费用：{0} CNY", DecreaseCNYTotalPrice.ToString("#0.00"));
                 #endregion
 
                 _view.GroupExpenditure = _geView;

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -472,7 +472,7 @@ namespace OASystem.API.OAMethodLib
                 return result;
             }
             //美元(USD):1.0000|欧元(EUR):1.0000|墨西哥比索(MXN):1.0000
-            string rateInit = string.Format(@"人名币(CNY):1.0000");
+            string rateInit = string.Format(@"人民币(CNY):1.0000");
 
             //var gropInfo = _dirRep._sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.IsDel == 0 && it.Id == diId).First();
             //if (gropInfo == null)

OASystem/OASystem.Api/OAMethodLib/Quartz/Business/TaskAssignment.cs

@@ -13,6 +13,7 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
     public static class TaskAssignment
     {
         private readonly static TaskAllocationRepository _taskAllocationRep = AutofacIocManager.Instance.GetService<TaskAllocationRepository>();
+        //private readonly static SqlSugarClient _sqlSugar = AutofacIocManager.Instance.GetService<SqlSugarClient>();
         private readonly static ILogger _logger;
         /// <summary>
         /// 定时任务更改状态
@@ -20,25 +21,26 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
         /// </summary>
         public static async void PostTaskUpdateStatus()
         {
-            var data = await _taskAllocationRep._sqlSugar
-                                               .Queryable<Pm_TaskAllocation>()
-                                               .Where(it => it.IsDel == 0 &&
-                                                            !string.IsNullOrEmpty(it.PredictEndTime) &&
-                                                            Convert.ToDateTime(it.PredictEndTime) >= DateTime.Now
-                                                     )
-                                               .ToListAsync();
+            //_taskAllocationRep.ChangeDataBase(DBEnum.OA2023DB);
+            var data = _taskAllocationRep._sqlSugar
+                                         .Queryable<Pm_TaskAllocation>()
+                                         .Where(it => it.IsDel == 0 &&
+                                                      !string.IsNullOrEmpty(it.PredictEndTime) &&
+                                                      Convert.ToDateTime(it.PredictEndTime) >= DateTime.Now
+                                               )
+                                         .ToList();
             if (data.Count > 0)
             {
                 //处理要变更状态的员工
                 List<int> primaryIds = new List<int>();
                 primaryIds = data.Select(it => it.Id).ToList();
-                var subData = await _taskAllocationRep._sqlSugar
-                                                      .Queryable<Pm_TaskRelevanceUser>()
-                                                      .Where(it => it.IsDel == 0 &&
-                                                                   primaryIds.Contains(it.TAId) &&
-                                                                   it.TaskStatus <= TaskerEnum.UnderWay
-                                                            )
-                                                      .ToListAsync();
+                var subData = _taskAllocationRep._sqlSugar
+                                                .Queryable<Pm_TaskRelevanceUser>()
+                                                .Where(it => it.IsDel == 0 &&
+                                                             primaryIds.Contains(it.TAId) &&
+                                                             it.TaskStatus <= TaskerEnum.UnderWay
+                                                      )
+                                                .ToList();
                 foreach (var item in subData)
                 {
                     item.OverTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -47,11 +49,11 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                 }
                 if (subData.Count > 0)
                 {
-                    var updateStatus = await _taskAllocationRep._sqlSugar
-                                                               .Updateable(subData)
-                                                               .WhereColumns(it => it.Id)
-                                                               .ExecuteCommandAsync();
-
+                    var updateStatus = _taskAllocationRep._sqlSugar
+                                                         .Updateable(subData)
+                                                         .WhereColumns(it => it.Id)
+                                                         .ExecuteCommand();
+                    //_taskAllocationRep._sqlSugar.Close();
                 }
             }
         }

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

@@ -476,7 +476,7 @@ namespace OASystem.Domain.ViewModels.Financial
         public decimal PayRate { get; set; }
 
         /// <summary>
-        /// 小计人名币金额
+        /// 小计人民币金额
         /// </summary>
         public decimal CNYSubTotalAmount { get; set; }
 

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

@@ -322,7 +322,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public decimal DayRate { get; set; } = 1.0000M;
 
         /// <summary>
-        /// 人名币金额
+        /// 人民币金额
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 
@@ -388,7 +388,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public decimal Price { get; set; } = 0.00M;
 
         /// <summary>
-        /// 人名币金额
+        /// 人民币金额
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 
@@ -651,7 +651,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public decimal PayMoney { get; set; } = 0.00M;
 
         /// <summary>
-        /// 人名币金额
+        /// 人民币金额
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 
@@ -752,7 +752,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public decimal DayRate { get; set; } = 1.0000M;
 
         /// <summary>
-        /// 付款人名币金额
+        /// 付款人民币金额
         /// </summary>
         public decimal CNYPrice { get; set; }
 
@@ -1030,7 +1030,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public string? PaymentCurrency { get; set; }
 
         /// <summary>
-        /// 人名币费用
+        /// 人民币费用
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 
@@ -1097,7 +1097,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public string? PayMoneyCurrency { get; set; }
 
         /// <summary>
-        /// 人名币金额
+        /// 人民币金额
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 
@@ -1163,7 +1163,7 @@ namespace OASystem.Domain.ViewModels.Statistics
         public decimal DayRate { get; set; } = 1.0000M;
 
         /// <summary>
-        /// 人名币金额
+        /// 人民币金额
         /// </summary>
         public decimal CNYPrice { get; set; } = 0.00M;
 

OASystem/OASystem.Infrastructure/Repositories/Groups/TeamRateRepository.cs

@@ -61,11 +61,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 ///*
                 // * 放在首位币种
-                // * 人名币 CNY Rate = 1，美元 USD，欧元 EUR，港币 HKD，日元 JPY ，澳大利 AUD,英镑 GBP
+                // * 人民币 CNY Rate = 1，美元 USD，欧元 EUR，港币 HKD，日元 JPY ，澳大利 AUD,英镑 GBP
                 // * 依次排序
                 // */
 
-                ////人名币
+                ////人民币
                 //var cnyData = teamRateDescViews.Find(it => it.CurrencyCode.Equals("CNY"));
                 //if (cnyData != null) { teamRateDescViews.Remove(cnyData); cnyData.Rate = 1.0000M; teamRateDescViews.Insert(0, cnyData); }
 
@@ -205,7 +205,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 if (!rateStr.Contains("CNY"))
                 {
-                    rateStr += "人名币(CNY):1.0000|";
+                    rateStr += "人民币(CNY):1.0000|";
                 }
 
                 if (rateStr.Length > 0)
@@ -752,7 +752,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             foreach (var item in _view)
             {
-                if (item.CurrencyId == 836) // 人名币
+                if (item.CurrencyId == 836) // 人民币
                 {
                     item.Rate = 1.0000M;
                 }

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

@@ -85,7 +85,14 @@ namespace OASystem.Infrastructure.Repositories.System
 
                 if (PortType == 1)
                 {
-                    sql += $@" and b.Id = 1 and d.IsEnable = 1  group by 
+                    //只返回查看权限
+                    //sql += $@" and b.Id = 1 and d.IsEnable = 1  group by 
+                    //  a.UId,a.SmId,b.Id,b.FunctionName,b.FunctionCode,c.Id,
+                    //  c.Name,c.STid,d.Id,d.Name,d.SystemMenuCode,d.webUrl,d.AndroidUrl,d.icon,
+                    //  d.IosUrl";
+
+                    //返回所有权限
+                    sql += $@" and d.IsEnable = 1 group by 
                       a.UId,a.SmId,b.Id,b.FunctionName,b.FunctionCode,c.Id,
                       c.Name,c.STid,d.Id,d.Name,d.SystemMenuCode,d.webUrl,d.AndroidUrl,d.icon,
                       d.IosUrl";
@@ -118,26 +125,46 @@ namespace OASystem.Infrastructure.Repositories.System
                             var modul = item.FirstOrDefault();
                             if (modul != null)
                             {
+                                var pageInitData = item.GroupBy(it => it.pageid);
+
+                                var pageData = item.Where(it => it.pageid == modul.pageid).Select(it => new
+                                {
+                                    it.Uid,
+                                    it.SmId,
+                                    it.Funid,
+                                    it.FunctionName,
+                                    it.FunctionCode,
+                                    it.modulid,
+                                    it.modulName,
+                                    it.STid,
+                                    it.pageid,
+                                    it.PageName,
+                                    PageAuth = item.Where(it => it.pageid == modul.pageid).Select(it => new { it.Funid,it.FunctionCode,it.FunctionName }),
+                                    it.SystemMenuCode,
+                                    it.webUrl,
+                                    it.AndroidUrl,
+                                    it.IosUrl,
+                                    it.icon,
+
+                                });
+
+
                                 string Remark = setDataArr.Find(x => x.Id == modul.modulid)?.Remark;
+                                var modulData = new
+                                {
+                                    modulName = modul.modulName,
+                                    modulid = modul.modulid,
+                                    pageList = pageData,
+                                    Remark
+                                };
+
                                 if (modul.modulName.Contains("主页"))
                                 {
-                                    arr.Insert(0, new
-                                    {
-                                        modulName = modul.modulName,
-                                        modulid = modul.modulid,
-                                        pageList = item,
-                                        Remark
-                                    });
+                                    arr.Insert(0, modulData);
                                 }
                                 else
                                 {
-                                    arr.Add(new
-                                    {
-                                        modulName = modul.modulName,
-                                        modulid = modul.modulid,
-                                        pageList = item,
-                                        Remark
-                                    });
+                                    arr.Add(modulData);
                                 }
                             }
                         }