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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -6691,7 +6691,7 @@ FROM
             {
                 //GroupNameData = groupNameData.Data,
                 visaData = visaData.Data,
-                airData = airData.Data,
+                airData = airData,
                 reteInfos = reteInfos
             }));
         }
@@ -10551,7 +10551,7 @@ FROM
             else if (dto.TipsType == 3)
             {
                 var airData = await _ticketBlackCodeRep.EntryAndExitTips(dto.GroupId);
-                return Ok(JsonView(true, "查询成功！", airData.Data));
+                return Ok(JsonView(true, "查询成功！", airData));
             }
             return Ok(JsonView(false));
         }

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2165,8 +2165,8 @@ WHERE
                 })
                 .ToArray();
 
-            //var view = await _goodsRep.GoodsReceiveAudit(idArray, currUserInfo.UserId, dto.AuditEnum);
-            var view = new JsonView() { Code = StatusCodes.Status200OK};
+            var view = await _goodsRep.GoodsReceiveAudit(idArray, currUserInfo.UserId, dto.AuditEnum);
+            //var view = new JsonView() { Code = StatusCodes.Status200OK};
             //TODO：出库成功 并且是团组相关物资 向团组其他款项添加信息
             #region 出库成功并且是团组相关物资 向团组其他款项添加信息
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -157,7 +157,6 @@ namespace OASystem.API.OAMethodLib
 
                 if (defaultPageData.Count > 0)
                 {
-
                     //移除每个页面的审核权限，审核权限需要单独开启
                     defaultPageData = defaultPageData.Where(it => it.FId != 12).ToList();
 

OASystem/OASystem.Domain/ViewModels/Groups/AirTicketReservationsView.cs

@@ -241,4 +241,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string LandingTerminal { get; set; }
     }
+
+    public class EntryAndExitTipsView
+    {
+        public decimal jjcCurrentRate { get; set; }
+        public decimal gwcCurrentRate { get; set; }
+        public string remark { get; set; }
+    }
 }

OASystem/OASystem.Infrastructure/Repositories/Resource/TicketBlackCodeRepository.cs

@@ -179,28 +179,23 @@ namespace OASystem.Infrastructure.Repositories.Resource
         /// </summary>
         /// <param name="diId"></param>
         /// <returns></returns>
-        public async Task<Result> EntryAndExitTips(int diId)
+        public async Task<EntryAndExitTipsView[]> EntryAndExitTips(int diId)
         {
-            if (diId < 1) return new Result() { Code = -1, Msg = "请输入有效的DiId参数!" };
+            if (diId < 1) return  Array.Empty<EntryAndExitTipsView>();
 
-            Air_TicketBlackCode _TicketBlackCode = await _sqlSugar.Queryable<Air_TicketBlackCode>().FirstAsync(a => a.IsDel == 0 && a.DiId == diId);
+            var airFees = await _sqlSugar.Queryable<Air_TicketBlackCode>().Where(a => a.IsDel == 0 && a.DiId == diId).ToListAsync();
 
-            if (_TicketBlackCode != null)
+            if (airFees.Any())
             {
-                return new Result()
+                return airFees.OrderByDescending(x => x.ECPrice + x.BCPrice).Select(x => new EntryAndExitTipsView
                 {
-                    Code = 0,
-                    Msg = "操作成功!",
-                    Data = new
-                    {
-                        jjcCurrentRate = _TicketBlackCode.ECPrice,
-                        gwcCurrentRate = _TicketBlackCode.BCPrice,
-                        Remark = $"经济舱全价：{_TicketBlackCode.ECPrice.ToString("#0.00")} 元/人 公务舱全价：{_TicketBlackCode.BCPrice.ToString("#0.00")} 元/人"
-                    }
-                };
+                    jjcCurrentRate = x.ECPrice,
+                    gwcCurrentRate = x.BCPrice,
+                    remark = $"经济舱全价：{x.ECPrice.ToString("#0.00")} 元/人 公务舱全价：{x.BCPrice.ToString("#0.00")} 元/人"
+                }).ToArray();
             }
 
-            return new Result() { Code = -1,Msg="操作失败" };
+            return Array.Empty<EntryAndExitTipsView>();
         }
 
         public Result DescBlackToVisa(int diid)