物资领用权限由 罗颖 更改为 陈湘

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -8663,12 +8663,12 @@ WHERE
             {
                 foreach (var dailyFee in companyDailyItems)
                 {
-                    dailyLabel += $"<p>[{dailyFee.CompanyName}]日常产生费用：{dailyFee.CNYTotal.ToString("#0.00")} CNY </p>";
-                    dailyExcelLabel += $"[{dailyFee.CompanyName}]日常产生费用：{dailyFee.CNYTotal.ToString("#0.00")} CNY \r\n";
+                    dailyLabel += $"<p>[{dailyFee.CompanyName}]日常产生费用：{dailyFee.CNYTotal:#0.00} CNY </p>";
+                    dailyExcelLabel += $"[{dailyFee.CompanyName}]日常产生费用：{dailyFee.CNYTotal:#0.00} CNY \r\n";
                 }
             }
 
-            string label = string.Format(@$"<div style='color:black'><p>团组收款合计：{groupCollectionTotal.ToString("#0.00")} CNY&nbsp;团组产生费用合计：{groupCostTotal.ToString("#0.00")} CNY&nbsp;团组利润合计：{groupProfitTotal.ToString("#0.00")} CNY</p><p>非团组收款合计：{notGroupCollectionTotal.ToString("#0.00")} CNY&nbsp;非团组产生费用合计：{notGroupCostTotal.ToString("#0.00")} CNY&nbsp;非团组利润合计：{notGroupProfitTotal.ToString("#0.00")} CNY</p>{dailyLabel}<p>其中会务：{inforCount}个</p><p>服务人数：{serviceCount}人</p>总利润：{totalProfit.ToString("#0.00")} CNY</div>");
+            string label = string.Format(@$"<div style='color:black'><p>团组收款合计：{groupCollectionTotal:#0.00} CNY&nbsp;团组产生费用合计：{groupCostTotal:#0.00} CNY&nbsp;团组利润合计：{groupProfitTotal:#0.00} CNY</p><p>非团组收款合计：{notGroupCollectionTotal:#0.00} CNY&nbsp;非团组产生费用合计：{notGroupCostTotal:#0.00} CNY&nbsp;非团组利润合计：{notGroupProfitTotal.ToString("#0.00")} CNY</p>{dailyLabel}<p>其中会务：{inforCount}个</p><p>服务人数：{serviceCount}人</p>总利润：{totalProfit:#0.00} CNY</div>");
 
             var datas = _mapper.Map<CorporateProfitItem[]>(groupItems);
             if (type == 2) //excel 下载
@@ -8721,6 +8721,7 @@ WHERE
             int portType = dto.PortType,
                 userId = dto.UserId,
                 pageId = dto.PageId;
+
             #region  参数验证
 
             //var validationRules = new CorporateProfitItemDtoFoalidator();

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CreditCardPaymentView.cs

@@ -178,6 +178,25 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int IsAuditGM { get; set; }
 
+        /// <summary>
+        /// 总经理审核标识
+        ///  未审核 1 已通过 2 未通过 3 自动审核
+        /// </summary>
+        public string AuditGMLabel
+        {
+            get
+            {
+                return IsAuditGM switch
+                {
+                    0 => "未审核",
+                    1 => "已通过",
+                    2 => "未通过",
+                    3 => "自动审核",
+                    _ => "未知状态"
+                };
+            }
+        }
+
         /// <summary>
         /// 超预算比例
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -880,15 +880,15 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 AuditorIds = new int[] {
                     187,    // 曾艳 
                     281,    // 伏虹瑾
-                    208,    // 雷怡
+                    //208,    // 雷怡
                 }
             };
 
             if (auditType == 1)//入库
             {
                 hrAuditorIds.AuditorIds = new int[] {
-                    //343,    // 陈湘 
-                    374,    // 罗颖
+                    343,    // 陈湘 
+                    //374,    // 罗颖
                     208,    // 雷怡
                 };
                 auditList.Add(hrAuditorIds);