diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index c2b3579..ef4b6c0 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -8,8 +8,8 @@ True e485308c-2f05-470b-b0a4-68f1ec2b3412 Linux - 1.0.1.17 - 1.0.1.17 + 1.0.1.25 + 1.0.1.25 @@ -47,9 +47,6 @@ - - Always - Always diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 39d3ad3..f13b865 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/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() - .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) @@ -2068,7 +2071,7 @@ namespace _24Hour.Controllers.Common return result; } - + public class DecodeQRDataModel { public string QRData { get; set; } diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index df45ed6..ba44c9f 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -142,6 +142,37 @@ namespace _24Hour.Controllers.Common _logs.WriteSysLogadd("律师服务", "添加律师服务", result, _db); return result; } + /// + /// 添加律师服务 + /// + /// + /// + [HttpPost] + [Route("AddLawyerInNet")] + public async Task 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; + } /// /// 修改律师服务预约 @@ -162,7 +193,7 @@ namespace _24Hour.Controllers.Common result.IsSucceed = true; result.result = "修改成功"; } - } + } catch (System.Exception ex) { _db.RollbackTran(); diff --git a/24Hour/TwentySystemProxyClient.cs b/24Hour/TwentySystemProxyClient.cs index 7aabd26..5c54610 100644 --- a/24Hour/TwentySystemProxyClient.cs +++ b/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(); } }); diff --git a/Elight.Entity/AppMode/App_LawyerServicesModel.cs b/Elight.Entity/AppMode/App_LawyerServicesModel.cs index 8ff2b33..2bf1817 100644 --- a/Elight.Entity/AppMode/App_LawyerServicesModel.cs +++ b/Elight.Entity/AppMode/App_LawyerServicesModel.cs @@ -46,11 +46,12 @@ namespace Elight.Entity /// 访问日期 /// [DataMember] - public DateTime? receptiontime { get; set; } - + public DateTime? receptiontime { get; set; } + /// /// 访问结束时间 /// + [DataMember] public DateTime? receptionEndtime { get; set; } /// diff --git a/WebApplication1/Controllers/TwentySystemController.cs b/WebApplication1/Controllers/TwentySystemController.cs index 3afb0a6..97754a0 100644 --- a/WebApplication1/Controllers/TwentySystemController.cs +++ b/WebApplication1/Controllers/TwentySystemController.cs @@ -32,14 +32,14 @@ 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; } [HttpGet] public async Task> GetJZXX(string dwbm, string bmsah) - { + { try { MDossier dossier = new MDossier(dwbm, $"{ip}:{port}");