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

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -4565,6 +4565,47 @@ GROUP BY
             return Ok(JsonView(await _deepSeek.ChatAsync(question)));
         }
 
+        private class clientView
+        {
+            public int Id { get; set; }
+            public string   LastName { get; set; }
+            public string FirstName { get; set; }
+        }
+
+        /// <summary>
+        /// DeepSeek Chat 测试
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> ClientInfo(string name )
+        {
+            var clientInfos = await _sqlSugar.Queryable<Crm_DeleClient>()
+                .Where(x => x.IsDel == 0)
+                .Select(x => new clientView { Id = x.Id, LastName = x.LastName })
+                .ToListAsync();
+
+            foreach (var item in clientInfos)
+            {
+                item.LastName = AesEncryptionHelper.Decrypt(item.LastName);
+            }
+
+            var searchIds = clientInfos.Where(x => x.LastName.Contains(name)).Select(x => x.Id).ToList();
+
+            var view = await _sqlSugar.Queryable<Crm_DeleClient>()
+                .Where(x => x.IsDel == 0)
+                .Where(x => searchIds.Contains(x.Id))
+                .Select(x => new clientView { Id = x.Id, LastName = x.LastName, FirstName = x.FirstName })
+                .ToListAsync();
+            foreach (var item in view)
+            {
+                item.LastName = AesEncryptionHelper.Decrypt(item.LastName);
+                item.FirstName = AesEncryptionHelper.Decrypt(item.FirstName);
+            }
+
+
+            return Ok(JsonView(view));
+        }
         #endregion
     }
 }

OASystem/OASystem.Api/OASystem.API.csproj

@@ -47,6 +47,7 @@
     <PackageReference Include="CurlThin.Native" Version="0.0.8" />
     <PackageReference Include="EPPlus" Version="7.4.1" />
     <PackageReference Include="Flurl.Http" Version="3.2.4" />
+    <PackageReference Include="iTextSharp" Version="5.5.13.4" />
     <PackageReference Include="JsonDiffPatch.Net" Version="2.3.0" />
     <PackageReference Include="Markdig" Version="0.33.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />

OASystem/OASystem.Api/appsettings.json

@@ -441,6 +441,10 @@
         {
           "Id": 21,
           "Name": "张海麟"
+        },
+        {
+          "Id": 281,
+          "Name": "伏虹瑾"
         }
       ]
     },

OASystem/OASystem.Domain/Entities/Groups/Grp_ProcessOverview.cs

@@ -138,12 +138,6 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(ColumnName = "ActualDone", ColumnDescription = "实际完成时间", IsNullable = true, ColumnDataType = "datetime")]
         public DateTime? ActualDone { get; set; }
 
-        ///// <summary>
-        ///// 国家
-        ///// </summary>
-        //[SugarColumn(ColumnName = "Country", ColumnDescription = "国家", ColumnDataType = "varchar(100)",IsNullable = true)]
-        //public string? Country { get; set; }
-
         /// <summary>
         /// 是否为当前节点
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Resource/CountryFeeRepository.cs

@@ -95,7 +95,8 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
             var query = _sqlSugar.Queryable<Res_VisaFeeStandard>()
                 .LeftJoin<Sys_Users>((x, y) => x.LastUpdateUserId == y.Id)
-                .Where((x, y) => x.IsDel == 0 && x.FeeType == feeType)
+                .Where((x, y) => x.IsDel == 0)
+                .WhereIF(feeType != -1, (x, y) => x.FeeType == feeType)
                 .WhereIF(!string.IsNullOrEmpty(countryName), x => x.Country.Contains(countryName) || countryName.Contains(x.Country))
                 .OrderByDescending((x, y) => x.LastUpdateTime)
                 .Select((x, y) => new VisaFeeStandardListView