Browse Source

修改git追踪文件

develop
胡超1 2 years ago
parent
commit
7cec54f1e2
  1. 16
      .gitignore
  2. 5
      24Hour/24Hour.csproj
  3. 36
      24Hour/Controllers/Common/LawyerArchivesController.cs
  4. 39
      24Hour/TwentySystemProxyClient.cs
  5. 111
      Dto/FindAjxxDto.cs
  6. 111
      Dto/FindSqrxxDto.cs
  7. 30
      Dto/RegisterDto.cs
  8. 211
      Dto/SaveBhdlDjxxDto.cs
  9. 1
      Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
  10. 11
      Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
  11. BIN
      Dto/obj/Debug/net6.0/Dto.assets.cache
  12. BIN
      Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
  13. 0
      Dto/obj/Debug/net6.0/Dto.csproj.BuildWithSkipAnalyzers
  14. 2
      Dto/obj/Debug/net6.0/Dto.csproj.CoreCompileInputs.cache
  15. 64
      Dto/obj/Dto.csproj.nuget.dgspec.json
  16. 15
      Dto/obj/Dto.csproj.nuget.g.props
  17. 69
      Dto/obj/project.assets.json
  18. 8
      Dto/obj/project.nuget.cache
  19. 153
      WebApplication1/Controllers/TwentySystemController.cs
  20. 11
      WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json
  21. 2
      WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.CoreCompileInputs.cache

16
.gitignore vendored

@ -80,9 +80,15 @@ dkms.conf
/24Hour/Properties/PublishProfiles/FolderProfile1.pubxml
/24Hour/Properties/PublishProfiles/FolderProfile1.pubxml.user
/24Hour/wwwroot
/Dto/obj/Release/net6.0/Dto.AssemblyInfo.cs
/Dto/obj/Release/net6.0/Dto.AssemblyInfoInputs.cache
/Dto/obj/Release/net6.0/Dto.assets.cache
/Dto/obj/Release/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
/Dto/obj/Release/net6.0/Dto.GlobalUsings.g.cs
/Dto/obj
/Dto/obj/Debug
/Dto/obj/Debug/net6.0
/Dto/obj/Release
*.cs
/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
/Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
/Dto/obj/Dto.csproj.nuget.dgspec.json
/Dto/obj/Dto.csproj.nuget.g.props
/Dto/obj/project.assets.json
/Dto/obj/project.nuget.cache

5
24Hour/24Hour.csproj

@ -8,8 +8,8 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<UserSecretsId>e485308c-2f05-470b-b0a4-68f1ec2b3412</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<AssemblyVersion>1.0.1.16</AssemblyVersion>
<Version>1.0.1.16</Version>
<AssemblyVersion>1.0.1.17</AssemblyVersion>
<Version>1.0.1.17</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -28,6 +28,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dto\Dto.csproj" />
<ProjectReference Include="..\Elight.Entity\Elight.Entity.csproj" />
<ProjectReference Include="..\Elight.Logic\Elight.Logic.csproj" />
<ProjectReference Include="..\Elight.Utility\Elight.Utility.csproj" />

36
24Hour/Controllers/Common/LawyerArchivesController.cs

@ -80,7 +80,6 @@ namespace _24Hour.Controllers.Common
res.result = data;
return res;
}
/// <summary>
/// 修改内网律师信息
/// </summary>
@ -815,8 +814,6 @@ namespace _24Hour.Controllers.Common
};
return result;
}
/// <summary>
/// 统计阅卷信息
/// </summary>
@ -989,7 +986,6 @@ namespace _24Hour.Controllers.Common
};
return result;
}
/// <summary>
/// 按律师分类
/// </summary>
@ -1105,6 +1101,8 @@ namespace _24Hour.Controllers.Common
[HttpGet]
[Route("ImportLawyerArchivesInfo")]
public async Task<Result> ImportLawyerArchivesInfo(string path)
{
try
{
if (System.IO.File.Exists(path) == false)
{
@ -1283,14 +1281,21 @@ namespace _24Hour.Controllers.Common
_db.CommitTran();
}
}
}
catch(Exception ex)
{
result.Message = ex.Message;
result.IsSucceed = false;
return result;
}
result.IsSucceed = true;
return result;
}
[HttpPost]
[Route("ExportLawyerArchivesInfo")]
public async Task<Result> ExportLawyerArchivesInfo(List<string> ids)
{
try
{
var lawyerarchives = await _db.Queryable<App_LawyerServicesModel>()
.In(info => info.Id, ids)
@ -1328,7 +1333,7 @@ namespace _24Hour.Controllers.Common
if (Directory.Exists(lawyerdir) == false) Directory.CreateDirectory(lawyerdir);
var files = item.annex.ConvertToModel<List<string>>();
var files = item.annex.ConvertToModel<List<string>>() ?? new List<string>();
var annecdir = Path.Combine(lawyerdir, "annexs");
if (Directory.Exists(annecdir) == false) Directory.CreateDirectory(annecdir);
foreach (var file in files)
@ -1342,9 +1347,10 @@ namespace _24Hour.Controllers.Common
}
var legalphotots = item.legalAidPhoto.ConvertToModel<List<string>>();
var legalphotots = item.legalAidPhoto.ConvertToModel<List<string>>() ?? new List<string>();
var legalAidPhotoDir = Path.Combine(lawyerdir, "legalAidPhoto");
if (Directory.Exists(legalAidPhotoDir) == false) Directory.CreateDirectory(legalAidPhotoDir);
foreach (var legalphotot in legalphotots)
{
var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + legalphotot.Replace("/", @"\");
@ -1356,9 +1362,11 @@ namespace _24Hour.Controllers.Common
}
var relationshipProofPhotos = item.relationshipProofPhoto.ConvertToModel<List<string>>();
var relationshipProofPhotos = item.relationshipProofPhoto.ConvertToModel<List<string>>() ?? new List<string>();
var relationshipProofPhotoDir = Path.Combine(lawyerdir, "relationshipProofPhoto");
if (Directory.Exists(relationshipProofPhotoDir) == false) Directory.CreateDirectory(relationshipProofPhotoDir);
foreach (var relationshipProofPhoto in relationshipProofPhotos)
{
var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + relationshipProofPhoto.Replace("/", @"\");
@ -1369,7 +1377,7 @@ namespace _24Hour.Controllers.Common
}
}
var otherPhotos = item.otherPhoto.ConvertToModel<List<string>>();
var otherPhotos = item.otherPhoto.ConvertToModel<List<string>>() ?? new List<string>();
var otherPhotoDir = Path.Combine(lawyerdir, "otherPhoto");
if (Directory.Exists(otherPhotoDir) == false) Directory.CreateDirectory(otherPhotoDir);
foreach (var otherPhoto in otherPhotos)
@ -1434,7 +1442,13 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = true;
return result;
}
catch(Exception ex)
{
result.IsSucceed = false;
result.Message = ex.Message;
return result;
}
}
[HttpPost]
[Route("UploadSignImage")]
/// <summary>

39
24Hour/TwentySystemProxyClient.cs

@ -1,9 +1,11 @@
using com.sun.xml.@internal.xsom;
using Dto;
using Elight.Entity.APPDto.Lawyer;
using Elight.Utility;
using Elight.Utility.Code;
using Elight.Utility.Extensions;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc;
namespace _24Hour
{
@ -20,6 +22,19 @@ namespace _24Hour
httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample");
httpCliet.DefaultRequestHeaders.ConnectionClose = true;
}
/// <summary>
/// 申请人资格资料
/// </summary>
/// <returns></returns>
[HttpPost("UploadImage")]
public async Task<Result> UploadImage(UploadDto dto)
{
var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/UploadImage", dto);
var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
return response.ConvertToModel<Result>();
}
public async Task<Result<QueryResult<CaseInfo>>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size)
{
Result<QueryResult<CaseInfo>> Result = new();
@ -91,7 +106,6 @@ namespace _24Hour
}
return Result;
}
public async Task<Result<JZJBXXDto>> GetArchivesInfo(string bmsah, string dwbm)
{
var result = new Result<JZJBXXDto>();
@ -200,5 +214,28 @@ namespace _24Hour
public string? sfkcz { get; set; }
public string? qlzt { get; set; }
}
class MyClass
{
/// <summary>
/// 部门受案号
/// </summary>
public string bmsah { get; set; }
/// <summary>
/// base64字符串
/// </summary>
public string ImageStr { get; set; }
/// <summary>
/// 1423000000100-律师执业证书,
/// 1423000000200-律师事务所证,
/// 1423000000300-授权委托书,
/// 1423000000400-法律援助公函,
/// 1423000000500-身份证件 ,
/// 1423000000600-关系证明材料,
/// 1423000000700-其他
/// </summary>
public string Code { get; set; }
}
}
}

111
Dto/FindAjxxDto.cs

@ -0,0 +1,111 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Dto
{
public class FindAjxxDto
{
public int endRow { get; set; }
public int firstPage { get; set; }
public bool hasNextPage { get; set; }
public bool hasPreviousPage { get; set; }
public bool isFirstPage { get; set; }
public bool isLastPage { get; set; }
public List<FindAjxxBaseDto> list { get; set; }
public int lastPage { get; set; }
public int navigateFirstPage { get; set; }
public int navigateLastPage { get; set; }
public int navigatePages { get; set; }
public List<int> navigatepageNums { get; set; }
public int nextPage { get; set; }
public int pageNum { get; set; }
public int pageSize { get; set; }
public int pages { get; set; }
public int prePage { get; set; }
public int size { get; set; }
public int startRow { get; set; }
public int total { get; set; }
}
public class FindAjxxBaseDto
{
/// <summary>
/// 案件类型编码
/// </summary>
public string ajlbbm { get; set; }
/// <summary>
/// 案件类型名称
/// </summary>
public string ajlbmc { get; set; }
/// <summary>
/// 案件名称
/// </summary>
public string ajmc { get; set; }
/// <summary>
/// 案情摘要
/// </summary>
public string aqzy { get; set; }
/// <summary>
/// 部门受案号
/// </summary>
public string bmsah { get; set; }
/// <summary>
/// 承办部门编码
/// </summary>
public string cbbmbm { get; set; }
/// <summary>
/// 承办部门名称
/// </summary>
public string cbbmmc { get; set; }
/// <summary>
/// 承办单位编码
/// </summary>
public string cbdwbm { get; set; }
/// <summary>
/// 承办单位名称
/// </summary>
public string cbdwmc { get; set; }
/// <summary>
/// 承办检察官
/// </summary>
public string cbjcg { get; set; }
/// <summary>
/// 承办阶段编码
/// </summary>
public string cbjcgbm { get; set; }
/// <summary>
/// 承办阶段名称
/// </summary>
public string dqjdmc { get; set; }
/// <summary>
///
/// </summary>
public string sfkcz { get; set; }
/// <summary>
/// 受理日期
/// </summary>
public string slrq { get; set; }
/// <summary>
/// 移送单位名称
/// </summary>
public string ysdwdm { get; set; }
/// <summary>
/// 移送单位名称
/// </summary>
public string ysdwmc { get; set; }
}
}

111
Dto/FindSqrxxDto.cs

@ -0,0 +1,111 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Dto
{
public class FindSqrxxDto
{
public List<ContentDto> content { get; set; }
public bool empty { get; set; }
public bool first { get; set; }
public bool last { get; set; }
public int number { get; set; }
public int numberOfElements { get; set; }
public PageableDto pageable { get; set; }
public int size { get; set; }
public SortDto sort { get; set; }
public int totalPages { get; set; }
public int totalElements { get; set; }
}
public class ContentDto
{
/// <summary>
/// 创建时间
/// </summary>
public string cjsj { get; set; }
/// <summary>
/// 等级单位代码
/// </summary>
public string djdwbm { get; set; }
/// <summary>
/// 等级单位代码
/// </summary>
public string djdwmc { get; set; }
/// <summary>
/// 居民身份证
/// </summary>
public string jmsfzh { get; set; }
public object lxdh { get; set; }
public object lxdz { get; set; }
public string sfsc { get; set; }
public string sjbsbh { get; set; }
public string sjly { get; set; }
public string sqrbh { get; set; }
public string sqrlxdm { get; set; }
/// <summary>
/// 申请人类型
/// </summary>
public string sqrlxmc { get; set; }
/// <summary>
/// 申请人身份代码
/// </summary>
public string sqrsfdm { get; set; }
/// <summary>
/// 申请人身份 -律师
/// </summary>
public string sqrsfmc { get; set; }
/// <summary>
/// 申请人姓名
/// </summary>
public string sqrxm { get; set; }
public string szlssws { get; set; }
public string tyshxydm { get; set; }
public object zbls { get; set; }
public string zhxgsj { get; set; }
/// <summary>
/// 证件类型号码
/// </summary>
public string zjhm { get; set; }
/// <summary>
/// 证件类型代码
/// </summary>
public string zjlxdm { get; set; }
/// <summary>
/// 证件类型名称
/// </summary>
public string zjlxmc { get; set; }
public object zyzh { get; set; }
}
public class PageableDto
{
public int offset { get; set; }
public int pageNumber { get; set; }
public int pageSize { get; set; }
public bool paged { get; set; }
public bool unpaged { get; set; }
public SortDto sort { get; set; }
}
public class SortDto
{
public bool empty { get; set; }
public bool sorted { get; set; }
public bool unsorted { get; set; }
}
}

30
Dto/RegisterDto.cs

@ -34,20 +34,20 @@ namespace Dto
/// <summary>
/// 当事人-委托人
/// </summary>
public int PartyConsignor { get; set; }
public string PartyConsignor { get; set; }
/// <summary>
/// 当事人-委托人关系
/// </summary>
public int PartyPrincipalRelationship { get; set; }
public string PartyPrincipalRelationship { get; set; }
/// <summary>
/// 申请人-身份证
/// 申请人-律师证件号码
/// </summary>
public string ProposerIdCard { get; set; }
public string ProposerZJHM { get; set; }
/// <summary>
/// 申请人类型
@ -67,5 +67,27 @@ namespace Dto
/// </summary>
public string ProposerSCC { get; set; }
/// <summary>
/// 委托人
/// </summary>
public string Wtr { get; set; }
/// <summary>
/// 委托人与当事人关系
/// </summary>
public string Wtrydsrgxdm { get; set; }
/// <summary>
/// 委托人与当事人关系
/// </summary>
public string Wtrydsrgxmc { get; set; }
/// <summary>
/// 值班律师
/// </summary>
public string Zbls { get; set; }
public string Lxdh { get; set; }
public string Lxdz { get; set; }
}
}

211
Dto/SaveBhdlDjxxDto.cs

@ -0,0 +1,211 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Dto
{
public class SaveBhdlDjxxDto
{
/// <summary>
/// 单位编码
/// </summary>
public string ajcbdwbm { get; set; }
/// <summary>
/// 单位名称
/// </summary>
public string ajcbdwmc { get; set; }
/// <summary>
/// 案件名称
/// </summary>
public string ajmc { get; set; }
/// <summary>
///
/// </summary>
public string bhdlbh { get; set; }
/// <summary>
/// 部门受案号
/// </summary>
public string bmsah { get; set; }
/// <summary>
/// 承办检察官
/// </summary>
public string czr { get; set; }
/// <summary>
/// 承办检察官编码
/// </summary>
public string czrybm { get; set; }
/// <summary>
/// 单位编码
/// </summary>
public string dwbm { get; set; }
/// <summary>
/// 法律援助内容
/// </summary>
public string flyznr { get; set; }
/// <summary>
/// /
/// </summary>
// public string jwgkdjid { get; set; }
/// <summary>
/// 是否案管登记 Y
/// </summary>
public string sfagdj { get; set; }
/// <summary>
/// 是否法律援助
/// </summary>
public string sfflyz { get; set; }
/// <summary>
/// 申请人编号
/// </summary>
public string sqrbh { get; set; }
public string wfwgqkdm { get; set; } = null;
public string wfwgqkmc { get; set; } = "";
public string wfwgqknr { get; set; } = null;
/// <summary>
/// 委托人
/// </summary>
public string wtr { get; set; }
/// <summary>
/// 委托人与当事人关系 代码
/// </summary>
public string wtrydsrgxdm { get; set; }
/// <summary>
/// 委托人与当事人关系名称
/// </summary>
public string wtrydsrgxmc { get; set; }
/// <summary>
/// 值班律师
/// </summary>
public string zbls { get; set; }
/// <summary>
/// 责任人编码
/// </summary>
public string zrrbm { get; set; }
public BhdlYxSqrInsertInputDto bhdlYxSqrInsertInputDto { get; set; }
}
public class BhdlYxSqrInsertInputDto
{
/// <summary>
/// 登记单位编码
/// </summary>
public string djdwbm { get; set; }
/// <summary>
/// 登记单位名称
/// </summary>
public string djdwmc { get; set; }
/// <summary>
/// 居民身份证号码
/// </summary>
public string jmsfzh { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string lxdh { get; set; }
/// <summary>
/// 联系地址
/// </summary>
public string lxdz { get; set; }
/// <summary>
///
/// </summary>
public bool sfgxlsk { get; set; } = false;
/// <summary>
/// 申请人类型d代码 1403187300001 -辩护人
/// </summary>
public string sqrlxdm { get; set; }
/// <summary>
/// 申请人类型
/// </summary>
public string sqrlxmc { get; set; }
/// <summary>
/// 身份代码
/// </summary>
public string sqrsfdm { get; set; }
/// <summary>
/// 身份名称
/// </summary>
public string sqrsfmc { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string sqrxm { get; set; }
/// <summary>
/// 所在律师事务所
/// </summary>
public string szlssws { get; set; }
/// <summary>
/// 律师事务所统一社会信用代码
/// </summary>
public string tyshxydm { get; set; }
/// <summary>
/// 证件号码
/// </summary>
public string zjhm { get; set; }
/// <summary>
/// 证件类型代码
/// </summary>
public string zjlxdm { get; set; }
/// <summary>
/// 证件类型
/// </summary>
public string zjlxmc { get; set; }
}
}

1
Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache

@ -1 +0,0 @@
24467ac260176f765658abbc64d2580ba42c4bc0

11
Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig

@ -1,11 +0,0 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Dto
build_property.ProjectDir = C:\core\24Hour.Service\Dto\

BIN
Dto/obj/Debug/net6.0/Dto.assets.cache

Binary file not shown.

BIN
Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache

Binary file not shown.

0
Dto/obj/Debug/net6.0/Dto.csproj.BuildWithSkipAnalyzers

2
Dto/obj/Debug/net6.0/Dto.csproj.CoreCompileInputs.cache

@ -1 +1 @@
ccca575b8362d1b2377ddd7db4c9085ea077e8d3
f9c18559eda95e06ad72c50817c8719331c1dbf8

64
Dto/obj/Dto.csproj.nuget.dgspec.json

@ -1,64 +0,0 @@
{
"format": 1,
"restore": {
"C:\\core\\24Hour.Service\\Dto\\Dto.csproj": {}
},
"projects": {
"C:\\core\\24Hour.Service\\Dto\\Dto.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"projectName": "Dto",
"projectPath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
"outputPath": "C:\\core\\24Hour.Service\\Dto\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\游戏文件夹\\Dll": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
}
}
}
}
}

15
Dto/obj/Dto.csproj.nuget.g.props

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
</ItemGroup>
</Project>

69
Dto/obj/project.assets.json

@ -1,69 +0,0 @@
{
"version": 3,
"targets": {
"net6.0": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"net6.0": []
},
"packageFolders": {
"C:\\Users\\Administrator\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"projectName": "Dto",
"projectPath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
"outputPath": "C:\\core\\24Hour.Service\\Dto\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\游戏文件夹\\Dll": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
}
}
}
}

8
Dto/obj/project.nuget.cache

@ -1,8 +0,0 @@
{
"version": 2,
"dgSpecHash": "aBP4DpXaMgoARxZa7jC+2/OpB8f0apQvutUjpKvCZq5BqhIvN/WzLcvuunyUhHgo503i8NiV6jJvit7a9mkSCQ==",
"success": true,
"projectFilePath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"expectedPackageFiles": [],
"logs": []
}

153
WebApplication1/Controllers/TwentySystemController.cs

@ -366,7 +366,7 @@ namespace WebApplication1.Controllers
pageSize = 10,
pageNum = 1,
blzt = 0,
dwbm = "410503",
dwbm = dto.UnitCode,
bmsah = dto.Bmsah,
ajmc = "",
gjz = "",
@ -507,7 +507,7 @@ namespace WebApplication1.Controllers
/// <summary>
/// µÈ¼¶
/// 登记
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
@ -516,7 +516,7 @@ namespace WebApplication1.Controllers
{
Result result = new Result();
#region 判断
if (dto != null)
if (dto == null)
{
result.IsSucceed = false;
result.Message = "接收数据失败";
@ -558,7 +558,7 @@ namespace WebApplication1.Controllers
result.Message = "申请人联系电话不能为空";
return result;
}
if (string.IsNullOrEmpty(dto.ProposerIdCard))
if (string.IsNullOrEmpty(dto.ProposerZJHM))
{
result.IsSucceed = false;
result.Message = "申请人身份证不能为空";
@ -567,6 +567,63 @@ namespace WebApplication1.Controllers
#endregion
UploadImageDto uploadImageDto = new UploadImageDto()
{
pageSize = 10,
pageNum = 1,
blzt = 0,
dwbm = dto.UnitCode,
bmsah = dto.Bmsah,
ajmc = "",
gjz = "",
jsrq = null,
ksrq = null,
sqrxm = "",
sxlxdm = "",
zrrxm = "",
};
// 事项跟踪信息
var request = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlGl/findBhdlGzbl", uploadImageDto);
var findBhdlGzbl = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
var resultGzbl = JsonConvert.DeserializeObject<ResultGzbl>(findBhdlGzbl);
if (resultGzbl.success == false && resultGzbl.code != "0")
{
result.IsSucceed = false;
result.Message = "数据不存在";
return result;
}
string bhdlbh = resultGzbl.data.coumment.FirstOrDefault()?.bhdlbh;
string lx = "2803,1303,2801,2802,2804,2805,2001,2031,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2029,2032,2033,2034,2035,2036,2037,2039,2040,2041,2042,2043,2044,2048,2050,2051,2052,2053,2054,2055,2056,2058,2059,1602,2062,2077,2078,1603,1621,1622,1604,1638,1650,1608,1611,1614,1635,1626,1632,1625,1619,1634,1630,1631,1633,1636,1637,1801,1802,1803,1805,1806,1807,1808,1809,1810,1812,1813,1916,1919,1917,1918,1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,1915,0708,0709,0710,0711,0712,0726,0722,0725,0727,0702,0703,0704,0705,0706,0724,0723,0720,0721,0713,0718,0719,0717,0701,0707,0714,0715,0716,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1714,1715,1716,1718,1719,1720,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,1736,1737,1738,1740,1741,1742,1743,1744,1745,1747,1748,1749,1750,1752,1753,1754,1756,1757,1758,1759,1760,1761,1762,1784,1789,1785,1786,1787,1788,2714,1768,2736,1769,2713,1770,2715,1771,1778,1772,1779,1773,1780,1774,1781,1775,1782,2734,2735,2732,2733,1790,1791,1792,2701,2702,2703,2704,2705,2706,2707,2708,2710,2711,2712,2716,2717,2718,2719,2721,2722,2723,2724,2726,2727,2728,2729,2730,2731,2737,0802,0803,0805,0806,0826,0818,0819,0808,0809,0810,0811,0812,0814,0815,0816,0817,0820,0821,0822,0823,0804,0813,0824,0825,0827,0828,1406,1401,1402,1403,1404,1405,1408,1409,1410,1411,1412,1413,1414,1415,1416,1107,1111,1112,1108,1302,1304,1305,2210,2211,2302,2303,2301,2401,2402,2119,2122,2123,2120,2601,2602,2603,2604,0301,3001,3002";
var findAjxx = new
{
ajlbbms = lx.Split(",").ToList(),
dwbm = dto.UnitCode,
gjz = "",
bmsah = dto.Bmsah,
ajmc = "",
cbjcg = "",
zrrxm = "",
ksrq = "",
jsrq = "",
pageNum = 1,
pageSize = 10
};
//案件信息
var ajrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlGl/findAjxx", findAjxx);
var ajModel = await ajrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
var ajxxDto = JsonConvert.DeserializeObject<ResultDataDto<FindAjxxDto>>(ajModel);
if (ajxxDto.code != "0" && ajxxDto.success == false)
{
result.IsSucceed = false;
result.Message = "数据不存在";
return result;
}
foreach (var item in ajxxDto.data.list)
{
var findAjgldsrxx = new
{
bmsah = dto.Bmsah,
@ -575,11 +632,93 @@ namespace WebApplication1.Controllers
pageNum = 1,
pageSize = 20
};
var request = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlGl/findAjgldsrxx", findAjgldsrxx);
var findBhdlGzbl = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
var resultGzbl = JsonConvert.DeserializeObject<ResultGzbl>(findBhdlGzbl);
//当事人信息
var dsrrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlGl/findAjgldsrxx", findAjgldsrxx);
var dsrResult = await dsrrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
var dsrModel = JsonConvert.DeserializeObject<ResultDataDto<AjgldsrxxDto>>(dsrResult);
if (dsrModel.success == false && dsrModel.code != "0" && dsrModel.data.list.Count == 0)
{
result.IsSucceed = false;
result.Message = "当事人数据不存在";
return result;
}
var dsrModle = dsrModel.data.list.Where(x => x.zjhm == dto.PartyIdCard).FirstOrDefault();
if (dsrModle == null)
{
result.IsSucceed = false;
result.Message = "当事人数据不存在";
return result;
}
///申请人信息
var findSqrxx = new
{
gjz = dto.ProposerZJHM,
pageNum = 0,
pageSize = 20
};
var sqrrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/findSqrxx", findSqrxx);
var sqrRuslt = await sqrrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
var SqrDto = JsonConvert.DeserializeObject<ResultDataDto<FindSqrxxDto>>(sqrRuslt);
if (SqrDto.success == false && SqrDto.code != "0" && SqrDto.data.content.Count == 0)
{
result.IsSucceed = false;
result.Message = "律师数据不存在";
return result;
}
var sqrModel = SqrDto.data.content.Where(x => x.zjhm == dto.ProposerZJHM).FirstOrDefault();
if (sqrModel == null)
{
result.IsSucceed = false;
result.Message = "律师数据不存在";
return result;
}
SaveBhdlDjxxDto saveBhdlDjxxDto = new SaveBhdlDjxxDto()
{
ajcbdwbm = dto.UnitCode,
ajcbdwmc = dto.UnitName,
ajmc = item.ajmc,
bhdlbh = bhdlbh,
bmsah = dto.Bmsah,
czr = item.cbjcg,
czrybm = item.cbjcgbm,
dwbm = dto.UnitCode,
flyznr = "",
sfagdj = "Y",
sfflyz = "N",
sqrbh = sqrModel.sqrbh,
wfwgqkdm = "",
wfwgqkmc = "",
wfwgqknr = "",
wtr = dto.Wtr,
wtrydsrgxdm = dto.Wtrydsrgxdm,
wtrydsrgxmc = dto.Wtrydsrgxmc,
zbls = dto.Zbls,
zrrbm = dsrModle.zrrbm,
bhdlYxSqrInsertInputDto = new BhdlYxSqrInsertInputDto()
{
djdwbm = sqrModel.djdwbm,
djdwmc = sqrModel.djdwmc,
jmsfzh = sqrModel.jmsfzh,
lxdh = dto.Lxdh,
lxdz = dto.Lxdz,
sfgxlsk = false,
sqrlxdm = sqrModel.sqrlxdm,
sqrlxmc = sqrModel.sqrlxmc,
sqrsfdm = sqrModel.sqrsfdm,
sqrsfmc = sqrModel.sqrsfmc,
sqrxm = sqrModel.sqrxm,
szlssws = sqrModel.szlssws,
tyshxydm = sqrModel.tyshxydm,
zjhm = sqrModel.zjhm,
zjlxdm = sqrModel.zjlxdm,
zjlxmc = sqrModel.zjlxmc,
}
};
var addrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/saveBhdlDjxx", saveBhdlDjxxDto);
var addRuslt = await addrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
}
return result;
}

11
WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json

@ -8,6 +8,7 @@
".NETCoreApp,Version=v6.0": {
"WebApplication1/1.0.1.0": {
"dependencies": {
"Dto": "1.0.0",
"Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.18.1",
"Newtonsoft.Json": "13.0.3",
"Swashbuckle.AspNetCore": "6.0.0"
@ -71,6 +72,11 @@
"fileVersion": "6.0.0.0"
}
}
},
"Dto/1.0.0": {
"runtime": {
"Dto.dll": {}
}
}
}
},
@ -135,6 +141,11 @@
"sha512": "sha512-VusRaCFt2As3SXBJmUOGA40IGr6ao+vsvDi7jbCS4AFx69kUUm8zxIHeJVqGov3w4lQowVxv8gmonRXDRh1FvQ==",
"path": "swashbuckle.aspnetcore.swaggerui/6.0.0",
"hashPath": "swashbuckle.aspnetcore.swaggerui.6.0.0.nupkg.sha512"
},
"Dto/1.0.0": {
"type": "project",
"serviceable": false,
"sha512": ""
}
}
}

2
WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.CoreCompileInputs.cache

@ -1 +1 @@
fc6a57648ae2715e3ffa56ead59576c5c6cfeb81
2374669d97bc9eeebd97d909453e867df6a39cf9

Loading…
Cancel
Save