处理2.0系统无法上传数据的bug

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -910,10 +910,12 @@ namespace _24Hour.Controllers.Common
         {
             try
             {
+                var departmenginfo = await _db.Queryable<App_Sys_UnitModel>().Where(x => x.unitCode == _userdata.unitCode).FirstAsync();
                 var lawyerArchives = await _db.Queryable<LawyerArchives>().Where(x => x.Id == lawyerarchivesId).FirstAsync();
+
                 var lawyersvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == lawyerArchives.lawyerserviceId).FirstAsync();
                 var lawyer = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == lawyerArchives.lawyerId).FirstAsync();
-                var departmenginfo = await _db.Queryable<App_Sys_UnitModel>().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;
                     }
                 }
@@ -1048,37 +1050,40 @@ namespace _24Hour.Controllers.Common
                         {
                             foreach (var item in identityphotos)
                             {
-                                var filepath = Path.Combine(Environment.CurrentDirectory, item);
+
-                                filepath = filepath.Replace(@"/", @"\");
+                               var path = item.Replace(@"/", @"\");
+                                var filepath = Environment.CurrentDirectory+@"\wwwroot"+path;
+                                if (System.IO.File.Exists(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 = Convert.ToBase64String(Encoding.UTF8.GetBytes(System.IO.File.ReadAllText(filepath)))
+                                        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)
                     {

24Hour/TwentySystemProxyClient.cs

@@ -35,11 +35,18 @@ namespace _24Hour
             return response.ConvertToModel<Result>();
         }
         public async Task<Result<SaveBhdlDjxxDto>> Register(RegisterDto dto)
+        {
+            try
             {
                 var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/Register", dto);
                 var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
                 return response.ConvertToModel<Result<SaveBhdlDjxxDto>>();
             }
+            catch(Exception ex)
+            {
+                return null;
+            }
+        }
         public async Task<Result<AjgldsrxxDto>> 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;
                 }