浏览代码

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

leiy 10 月之前
父节点
当前提交
f9edcd0056

文件差异内容过多而无法显示
+ 91 - 777
OASystem/OASystem.Api/Controllers/GroupsController.cs


+ 1 - 1
OASystem/OASystem.Domain/Entities/Groups/Grp_ApprovalTravel.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace OASystem.Domain.Entities.Groups
 {
     /// <summary>
-    /// 公务出访
+    /// 报批行程
     /// </summary>
     public class Grp_ApprovalTravel:EntityBase
     {

+ 1 - 1
OASystem/OASystem.Domain/Entities/Groups/Grp_ApprovalTravelDetails.cs

@@ -8,7 +8,7 @@ namespace OASystem.Domain.Entities.Groups
 {
 
     /// <summary>
-    /// 公务出访详细表
+    /// 报批行程详细表
     /// </summary>
     public class Grp_ApprovalTravelDetails:EntityBase
     {

+ 16 - 0
OASystem/OASystem.Infrastructure/Repositories/Resource/ThreeCodeRepository.cs

@@ -209,5 +209,21 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             return result;
         }
+
+
+        /// <summary>
+        /// 三字码数组查询
+        /// </summary>
+        /// <param name="codeArr">需要查询的三字码数组</param>
+        /// <returns>查询到的键值对数组</returns>
+
+        public Dictionary<string,Res_ThreeCode> QueryThreeCodeArray(List<string> codeArr)
+        {
+            codeArr.ForEach(code =>
+            {
+                code = code.ToUpper();
+            });
+            return Query(x => codeArr.Contains(x.Three.ToUpper())).ToList().ToDictionary(x => x.Three, x => x);
+        }
     }
 }