Merge branch 'develop' of http://192.168.0.12:3000/Coder/24Hour.Service into develop

24Hour/24Hour.csproj

@@ -8,8 +8,8 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<UserSecretsId>e485308c-2f05-470b-b0a4-68f1ec2b3412</UserSecretsId>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<AssemblyVersion>1.0.1.17</AssemblyVersion>
-		<Version>1.0.1.17</Version>
+		<AssemblyVersion>1.0.1.25</AssemblyVersion>
+		<Version>1.0.1.25</Version>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -47,9 +47,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Update="bgqyj.cn.pfx">
-		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
 		<None Update="caselist.txt">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -854,7 +854,7 @@ namespace _24Hour.Controllers.Common
                 logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}");
                 logger.LogInformation($"get departmenginfo:{departmenginfo.ConvertToJsonStr()}");
 
-                var bmsah= lawyerArchives.bmsah;
+                var bmsah = lawyerArchives.bmsah;
                 var partyIDcard = lawyersvc.partyIDcard;
                 var party = lawyersvc.party;
                 var identitycardId = lawyer.identitycardId;
@@ -1871,7 +1871,7 @@ namespace _24Hour.Controllers.Common
             try
             {
                 var lawyerarchives = await _db.Queryable<App_LawyerServicesModel>()
-                    .In(info => info.Id, ids)
+                    .Where(x => ids.Contains(x.Id))
                     .ToListAsync();
                 var userids = lawyerarchives
                     .Select(x => x.createuserId)
@@ -1896,7 +1896,10 @@ namespace _24Hour.Controllers.Common
                 {
                     lawyerservices = lawyerarchives,
                     users = users
-                }.ConvertToJsonStr().ConvertToBase64();
+                }
+                .ConvertToJsonStr()
+                .ConvertToBase64();
+
                 System.IO.File.WriteAllText(jsonfilepath, jsonstr);
                 //存储预约申请的相关附件
                 foreach (var item in lawyerarchives)

24Hour/Controllers/Common/LawyerservicesController.cs

@@ -142,6 +142,37 @@ namespace _24Hour.Controllers.Common
             _logs.WriteSysLogadd("律师服务", "添加律师服务", result, _db);
             return result;
         }
+        /// <summary>
+        /// 添加律师服务
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("AddLawyerInNet")]
+        public async Task<Result> AddLawyerInNet(App_LawyerServicesModel Lawyerdata)
+        {
+            try
+            {
+                _db.BeginTran();
+                Lawyerdata.Id = Guid.NewGuid().ToString();
+                var num = await _db.Insertable(Lawyerdata).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = "添加成功";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "添加律师服务预约");
+            }
+            _logs.WriteSysLogadd("律师服务", "添加律师服务", result, _db);
+            return result;
+        }
 
         /// <summary>
         /// 修改律师服务预约

24Hour/TwentySystemProxyClient.cs

@@ -51,7 +51,6 @@ namespace _24Hour
                 PartyIdCard = PartyIdCard
             }.ConvertToGetParam();
 
-
             var response = await Task.Run(async () =>
             {
        
@@ -109,7 +108,7 @@ namespace _24Hour
                 }
                 else
                 {
-                    var request = await httpCliet.GetAsync($"/TwentySystem/DsrList{bodu}");
+                    var request = await httpCliet.GetAsync($"/TwentySystem/LsList{bodu}");
                     return await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
                 }
             });

Elight.Entity/AppMode/App_LawyerServicesModel.cs

@@ -51,6 +51,7 @@ namespace Elight.Entity
         /// <summary>
         /// 访问结束时间
         /// </summary>
+        [DataMember]
         public DateTime? receptionEndtime { get; set; }
 
         /// <summary>

WebApplication1/Controllers/TwentySystemController.cs

@@ -32,7 +32,7 @@ namespace WebApplication1.Controllers
             ip = configuration.GetSection("Configs:SystemIp").Value;
             port = configuration.GetSection("Configs:Port").Value;
             httpClient = httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri("http://143.120.5.116:8080"); // new Uri($"http://{ip}:{port}");
+            httpClient.BaseAddress = new Uri($"http://{ip}:{port}");
             httpClient.DefaultRequestHeaders.Add("Accept", "application/json");
             httpClient.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample");
             httpClient.DefaultRequestHeaders.ConnectionClose = true;