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

OASystem/OASystem.Domain/Entities/Resource/Res_InvitationAI.cs

@@ -181,9 +181,9 @@ namespace OASystem.Domain.Entities.Resource
         public string Objective { get; set; }
         /// <summary>
         /// 数据条数
-        /// 每个国家获取数据总条数，默认10条
+        /// 每个国家获取数据总条数，默认20条
         /// </summary>
-        public int NeedCount { get; set; } = 5;
+        public int NeedCount { get; set; } = 20;
         /// <summary>
         /// 其他规则
         /// </summary>
@@ -297,41 +297,141 @@ namespace OASystem.Domain.Entities.Resource
             !string.IsNullOrEmpty(code) && _flatCache.TryGetValue(code, out var node) ? node : null;
 
         /// <summary>
-        /// 初始化全球行业分类静态数据
+        /// 初始化行业分类静态数据
         /// </summary>
         public static List<IndustryNode> BuildInitialData() => new()
+{
+    new() {
+        Code = "IND_MANU",
+        NameCn = "工业与制造业领域",
+        NameEn = "Industry & Manufacturing",
+        Keywords = "工业,制造,机械,装备,工厂,自动化",
+        Children = new()
         {
-            new() { Code = "TECH", NameCn = "信息技术", NameEn = "Technology", Keywords = "IT,互联网,软件,AI", Children = new() {
-                new() { Code = "TECH01", ParentCode = "TECH", NameCn = "软件开发与服务", NameEn = "Software & Services" },
-                new() { Code = "TECH02", ParentCode = "TECH", NameCn = "硬件与半导体", NameEn = "Hardware & Semiconductors" },
-                new() { Code = "TECH03", ParentCode = "TECH", NameCn = "人工智能与大数据", NameEn = "AI & Big Data" }
-            }},
-            new() { Code = "FIN", NameCn = "金融与财会", NameEn = "Financials", Keywords = "银行,保险,证券", Children = new() {
-                new() { Code = "FIN01", ParentCode = "FIN", NameCn = "银行业", NameEn = "Banking" },
-                new() { Code = "FIN02", ParentCode = "FIN", NameCn = "保险与风险管理", NameEn = "Insurance" },
-                new() { Code = "FIN03", ParentCode = "FIN", NameCn = "资本市场与证券", NameEn = "Capital Markets" }
-            }},
-            new() { Code = "MANU", NameCn = "工业制造", NameEn = "Manufacturing", Keywords = "工厂,机械,自动化", Children = new() {
-                new() { Code = "MANU01", ParentCode = "MANU", NameCn = "汽车与运输设备", NameEn = "Automotive" },
-                new() { Code = "MANU02", ParentCode = "MANU", NameCn = "机械与电气设备", NameEn = "Machinery & Electrical" },
-                new() { Code = "MANU03", ParentCode = "MANU", NameCn = "消费电子制造", NameEn = "Consumer Electronics" }
-            }},
-            new() { Code = "HLT", NameCn = "医疗保健", NameEn = "Healthcare", Keywords = "制药,医院,器械", Children = new() {
-                new() { Code = "HLT01", ParentCode = "HLT", NameCn = "制药与生物技术", NameEn = "Pharmaceuticals & Biotech" },
-                new() { Code = "HLT02", ParentCode = "HLT", NameCn = "医疗器械与供应", NameEn = "Medical Devices" },
-                new() { Code = "HLT03", ParentCode = "HLT", NameCn = "医疗机构与诊所", NameEn = "Health Institutions" }
-            }},
-            new() { Code = "GOV", NameCn = "政府与公共服务", NameEn = "Government", Keywords = "行政,机关,组织,NGO", Children = new() {
-                new() { Code = "GOV01", ParentCode = "GOV", NameCn = "政府行政机关", NameEn = "Administrative Bodies" },
-                new() { Code = "GOV02", ParentCode = "GOV", NameCn = "国际组织与NGO", NameEn = "International Orgs & NGOs" },
-                new() { Code = "GOV03", ParentCode = "GOV", NameCn = "公共教育与科研单位", NameEn = "Education & Research" }
-            }},
-            new() { Code = "CONS", NameCn = "消费与贸易", NameEn = "Consumer & Trade", Keywords = "零售,电商,物流", Children = new() {
-                new() { Code = "CONS01", ParentCode = "CONS", NameCn = "电子商务与零售", NameEn = "E-commerce & Retail" },
-                new() { Code = "CONS02", ParentCode = "CONS", NameCn = "物流与供应链", NameEn = "Logistics & Supply Chain" },
-                new() { Code = "CONS03", ParentCode = "CONS", NameCn = "酒店与旅游餐饮", NameEn = "Hospitality & Tourism" }
-            }}
-        };
+            new() { Code = "IND_MANU_01", ParentCode = "IND_MANU", NameCn = "工业与制造业领域", NameEn = "Industry & Manufacturing" }
+        }
+    },
+    new() {
+        Code = "ENERGY_RES",
+        NameCn = "能源与资源领域",
+        NameEn = "Energy & Resources",
+        Keywords = "能源,电力,煤炭,石油,天然气,矿产,新能源",
+        Children = new()
+        {
+            new() { Code = "ENERGY_RES_01", ParentCode = "ENERGY_RES", NameCn = "能源与资源领域", NameEn = "Energy & Resources" }
+        }
+    },
+    new() {
+        Code = "TRANS_LOG",
+        NameCn = "交通运输与物流领域",
+        NameEn = "Transportation & Logistics",
+        Keywords = "交通,运输,物流,港口,机场,铁路,公路,货运",
+        Children = new()
+        {
+            new() { Code = "TRANS_LOG_01", ParentCode = "TRANS_LOG", NameCn = "交通运输与物流领域", NameEn = "Transportation & Logistics" }
+        }
+    },
+    new() {
+        Code = "URBAN_RURAL",
+        NameCn = "城乡建设与规划领域",
+        NameEn = "Urban & Rural Construction & Planning",
+        Keywords = "城乡建设,规划,建筑,房地产,市政,工程",
+        Children = new()
+        {
+            new() { Code = "URBAN_RURAL_01", ParentCode = "URBAN_RURAL", NameCn = "城乡建设与规划领域", NameEn = "Urban & Rural Construction & Planning" }
+        }
+    },
+    new() {
+        Code = "ECO_ENV_WATER",
+        NameCn = "生态环境与水务领域",
+        NameEn = "Ecology, Environment & Water Affairs",
+        Keywords = "环保,生态,水务,水处理,污染治理,碳中和",
+        Children = new()
+        {
+            new() { Code = "ECO_ENV_WATER_01", ParentCode = "ECO_ENV_WATER", NameCn = "生态环境与水务领域", NameEn = "Ecology, Environment & Water Affairs" }
+        }
+    },
+    new() {
+        Code = "AGRI_FOOD",
+        NameCn = "农业与食品领域",
+        NameEn = "Agriculture & Food",
+        Keywords = "农业,种植,养殖,食品,农产品,粮食,渔业",
+        Children = new()
+        {
+            new() { Code = "AGRI_FOOD_01", ParentCode = "AGRI_FOOD", NameCn = "农业与食品领域", NameEn = "Agriculture & Food" }
+        }
+    },
+    new() {
+        Code = "FIN_TRADE",
+        NameCn = "金融与商贸领域",
+        NameEn = "Finance & Commerce",
+        Keywords = "金融,银行,保险,证券,商贸,零售,电商",
+        Children = new()
+        {
+            new() { Code = "FIN_TRADE_01", ParentCode = "FIN_TRADE", NameCn = "金融与商贸领域", NameEn = "Finance & Commerce" }
+        }
+    },
+    new() {
+        Code = "MED_HEALTH",
+        NameCn = "医药健康与康养领域",
+        NameEn = "Medicine, Health & Elderly Care",
+        Keywords = "医疗,医药,健康,康养,医院,器械,生物",
+        Children = new()
+        {
+            new() { Code = "MED_HEALTH_01", ParentCode = "MED_HEALTH", NameCn = "医药健康与康养领域", NameEn = "Medicine, Health & Elderly Care" }
+        }
+    },
+    new() {
+        Code = "CULT_TOUR_SPORT",
+        NameCn = "文化旅游与体育领域",
+        NameEn = "Culture, Tourism & Sports",
+        Keywords = "文化,旅游,体育,文创,传媒,娱乐,景区",
+        Children = new()
+        {
+            new() { Code = "CULT_TOUR_SPORT_01", ParentCode = "CULT_TOUR_SPORT", NameCn = "文化旅游与体育领域", NameEn = "Culture, Tourism & Sports" }
+        }
+    },
+    new() {
+        Code = "IT_DIGITAL",
+        NameCn = "信息科技与数字经济领域",
+        NameEn = "Information Technology & Digital Economy",
+        Keywords = "IT,科技,数字经济,软件,互联网,大数据,AI,云计算",
+        Children = new()
+        {
+            new() { Code = "IT_DIGITAL_01", ParentCode = "IT_DIGITAL", NameCn = "信息科技与数字经济领域", NameEn = "Information Technology & Digital Economy" }
+        }
+    },
+    new() {
+        Code = "EDU_TECH",
+        NameCn = "教育与科技领域",
+        NameEn = "Education & Technology",
+        Keywords = "教育,学校,培训,科研,技术,创新,学术",
+        Children = new()
+        {
+            new() { Code = "EDU_TECH_01", ParentCode = "EDU_TECH", NameCn = "教育与科技领域", NameEn = "Education & Technology" }
+        }
+    },
+    new() {
+        Code = "SOC_SERVICE",
+        NameCn = "社会服务与公共管理领域",
+        NameEn = "Social Services & Public Administration",
+        Keywords = "社会服务,公共管理,政府,民政,社区,公益",
+        Children = new()
+        {
+            new() { Code = "SOC_SERVICE_01", ParentCode = "SOC_SERVICE", NameCn = "社会服务与公共管理领域", NameEn = "Social Services & Public Administration" }
+        }
+    },
+    new() {
+        Code = "OTHER_KEY",
+        NameCn = "其他重点领域（应急，地质勘察，检测，知识产权）",
+        NameEn = "Other Key Fields",
+        Keywords = "应急,地质勘察,检测,知识产权,认证,标准",
+        Children = new()
+        {
+            new() { Code = "OTHER_KEY_01", ParentCode = "OTHER_KEY", NameCn = "其他重点领域（应急，地质勘察，检测，知识产权）", NameEn = "Other Key Fields" }
+        }
+    }
+};
     }
 
     #endregion

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);
@@ -1101,7 +1101,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
 
             #endregion
 
-
             string serverPath = $"{_url}{fileName}";
             designer.Workbook.Save($"{_excelPath}/{fileName}");
 
@@ -1190,15 +1189,15 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             if (dto.GoodsId > 0) dto.GoodsName = string.Empty;
             if (!string.IsNullOrEmpty(dto.GoodsName)) dto.GoodsId = 0;
 
-            if (currUserId == 343) //陈湘OAId登录 只显示贵重物品审核信息
-            {
-                if (_goodsTypeIds.Any())
-                {
-                    var newArray = typeLabel.ToList();
-                    newArray.AddRange(_goodsTypeIds);
-                    typeLabel = newArray.ToArray();
-                }
-            }
+            //if (currUserId == 343) //陈湘OAId登录 只显示贵重物品审核信息
+            //{
+            //    if (_goodsTypeIds.Any())
+            //    {
+            //        var newArray = typeLabel.ToList();
+            //        newArray.AddRange(_goodsTypeIds);
+            //        typeLabel = newArray.ToArray();
+            //    }
+            //}
 
             var beginBool = DateTime.TryParse(!string.IsNullOrEmpty(dto.BeginDt) ? $"{dto.BeginDt} 00:00:00" : string.Empty, out var begin);
             var endBool = DateTime.TryParse(!string.IsNullOrEmpty(dto.EndDt) ? $"{dto.EndDt} 00:00:00" : string.Empty, out var end);
@@ -3060,8 +3059,8 @@ FROM
 
 
             var checkValuableUserIds = new List<int>() {
-                343 , //陈湘OAId
-                309 , //赖红燕AId
+                //343, //陈湘OAId
+                309,   //赖红燕AId
             };
 
             var isValueable = false;