From 1cb62b89fd6d8898887c5990e98348785ec887a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Thu, 21 Dec 2023 19:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=862.0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 68 +++++++++++-------- 24Hour/TwentySystemProxyClient.cs | 16 +++-- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 39890aa..609455b 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -910,10 +910,12 @@ namespace _24Hour.Controllers.Common { try { + var departmenginfo = await _db.Queryable().Where(x => x.unitCode == _userdata.unitCode).FirstAsync(); var lawyerArchives = await _db.Queryable().Where(x => x.Id == lawyerarchivesId).FirstAsync(); + var lawyersvc = await _db.Queryable().Where(x => x.Id == lawyerArchives.lawyerserviceId).FirstAsync(); var lawyer = await _db.Queryable().Where(x => x.Id == lawyerArchives.lawyerId).FirstAsync(); - var departmenginfo = await _db.Queryable().Where(x => x.unitCode == _userdata.unitCode).FirstAsync(); + logger.LogInformation($"get lawyerarchivesinfo:{lawyerArchives.ConvertToJsonStr()}"); logger.LogInformation($"get lawyersvcinfo:{lawyersvc.ConvertToJsonStr()}"); logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}"); @@ -975,7 +977,7 @@ namespace _24Hour.Controllers.Common if (querydsr.result.list.Count <= 0) { result.IsSucceed = false; - result.Message = "案管系统不存在该律师信息，请注意核实律师信息"; + result.Message = "案管系统不存在该当事人信息，请注意核实律师信息"; return result; } } @@ -1007,7 +1009,7 @@ namespace _24Hour.Controllers.Common var registerinforequest = await Register(new RegisterDto() { - DepartMentNameSccCode= tyshxydm, + DepartMentNameSccCode = tyshxydm, DepartMentName = szlssws, CardId = jmsfzh, Bmsah = bmsah, @@ -1048,37 +1050,40 @@ namespace _24Hour.Controllers.Common { foreach (var item in identityphotos) { - var filepath = Path.Combine(Environment.CurrentDirectory, item); - filepath = filepath.Replace(@"/", @"\"); - await twentyClient.UploadImage(new UploadDto() + + var path = item.Replace(@"/", @"\"); + var filepath = Environment.CurrentDirectory+@"\wwwroot"+path; + if (System.IO.File.Exists(filepath)) { - Bmsah = registerinfo.bmsah, - FileName = Path.GetFileName(filepath), - Code = typecode, - UnitCode = registerinfo.dwbm, - UnitName = UnitName, - ImageStr = Convert.ToBase64String(Encoding.UTF8.GetBytes(System.IO.File.ReadAllText(filepath))) - }); + var basestr = Convert.ToBase64String(System.IO.File.ReadAllBytes(filepath)); + await twentyClient.UploadImage(new UploadDto() + { + Bmsah = registerinfo.bmsah, + FileName = Path.GetFileName(filepath), + Code = typecode, + Bhdlbm = registerinfo.bhdlbh, + UnitCode = registerinfo.dwbm, + UnitName = UnitName, + ImageStr = basestr + }); + } + } } }; /// 1423000000100-律师执业证书,1423000000200-律师事务所证, 1423000000300- 授权委托书, 1423000000400- 法律援助公函,1423000000500-身份证件 ,1423000000600-关系证明材料, 1423000000700- 其他 - await Task.WhenAll( - UploadPhoto(lawyer.identityphoto, "1423000000100"), - UploadPhoto(lawyer.departmentPhoto, "1423000000200"), - UploadPhoto(lawyersvc.annex, "1423000000300"), - UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400"), - UploadPhoto(lawyer.cardIdphoto, "1423000000500"), - UploadPhoto(lawyersvc.relationshipProofPhoto, "1423000000600"), - UploadPhoto(lawyersvc.otherPhoto, "1423000000700") - ) - .ContinueWith((x) => - { - logger.LogInformation("图片上传成功"); - }); - var applymarkingrequest = await ApplyMarKing(new() + await UploadPhoto(lawyer.identityphoto, "1423000000100"); + await UploadPhoto(lawyer.departmentPhoto, "1423000000200"); + await UploadPhoto(lawyersvc.annex, "1423000000300"); + await UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400"); + await UploadPhoto(lawyer.cardIdphoto, "1423000000500"); + await UploadPhoto(lawyersvc.relationshipProofPhoto, "1423000000600"); + await UploadPhoto(lawyersvc.otherPhoto, "1423000000700"); + + + var markinginput = new ApplyMarKingDto() { bhdlbh = registerinfo.bhdlbh, bmsah = registerinfo.bmsah, @@ -1089,13 +1094,16 @@ namespace _24Hour.Controllers.Common dwbm = registerinfo.dwbm, jwgksxid = "", sqrlxdm = registerinfo.bhdlYxSqrInsertInputDto.sqrlxdm, - sqrmc = registerinfo.bhdlYxSqrInsertInputDto.sqrxm, + sqrmc = lawyer.name, sqrq = DateTime.Now.ToString("yyyy-MM-dd"), sqrsfdm = registerinfo.bhdlYxSqrInsertInputDto.sqrsfdm, sxlxdm = "1405187400001", sxlxmc = "申请阅卷", - zrrmc = party - }); + zrrmc = party, + + + }; + var applymarkingrequest = await ApplyMarKing(markinginput); if (applymarkingrequest.IsSucceed == true) { diff --git a/24Hour/TwentySystemProxyClient.cs b/24Hour/TwentySystemProxyClient.cs index 8cdc244..ab6d5ef 100644 --- a/24Hour/TwentySystemProxyClient.cs +++ b/24Hour/TwentySystemProxyClient.cs @@ -36,9 +36,16 @@ namespace _24Hour } public async Task> Register(RegisterDto dto) { - var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/Register", dto); - var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); - return response.ConvertToModel>(); + try + { + var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/Register", dto); + var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + return response.ConvertToModel>(); + } + catch(Exception ex) + { + return null; + } } public async Task> QueryDsrList(string Bmsah, string UnitCode, string PartyIdCard) { @@ -179,7 +186,8 @@ namespace _24Hour } else { - var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/ApplyMarKing", dto); + var content = dto.ConvertToJsonStr(); + var request = await httpCliet.PostAsJsonAsync("/TwentySystem/ApplyMarKing", dto); var res = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); return res; }