diff --git a/.gitignore b/.gitignore index 142b308..316c38e 100644 --- a/.gitignore +++ b/.gitignore @@ -83,6 +83,16 @@ dkms.conf /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 +/Dto/obj/Debug/net6.0 /Dto/bin/Release/net6.0/Dto.deps.json /Dto/bin /Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig diff --git a/Dto/AddBhdlSqsxDto.cs b/Dto/AddBhdlSqsxDto.cs new file mode 100644 index 0000000..b3061bc --- /dev/null +++ b/Dto/AddBhdlSqsxDto.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dto +{ + public class AddBhdlSqsxDto + { + /// + /// 必要 + /// + public string bhdlbh { get; set; } + /// + /// 部门受案号 + /// + public string bmsah { get; set; } + public string clqkbm { get; set; } + public string clqkmc { get; set; } + /// + /// 承办人 + /// + public string czr { get; set; } + /// + /// 承办人编码 + /// + public string czrybm { get; set; } + /// + /// 单位编号 + /// + public string dwbm { get; set; } + public string jwgksxid { get; set; } + /// + /// 申请人类型代码 + /// + public string sqrlxdm { get; set; } + /// + /// 申请人名称 + /// + public string sqrmc { get; set; } + /// + /// 申请日期 + /// + public string sqrq { get; set; } + /// + /// 申请人身份代码 + /// + public string sqrsfdm { get; set; } + /// + /// 事项类型代码 + /// + public string sxlxdm { get; set; } + /// + /// 事项类型名称 + /// + public string sxlxmc { get; set; } + /// + /// 当事人 + /// + public string zrrmc { get; set; } + } +} diff --git a/Dto/ApplyMarKingDto.cs b/Dto/ApplyMarKingDto.cs new file mode 100644 index 0000000..20e5ad4 --- /dev/null +++ b/Dto/ApplyMarKingDto.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dto +{ + public class ApplyMarKingDto + { + /// + /// 必要 + /// + public string bhdlbh { get; set; } + /// + /// 部门受案号 + /// + public string bmsah { get; set; } + public string clqkbm { get; set; } + public string clqkmc { get; set; } + /// + /// 承办人 + /// + public string czr { get; set; } + /// + /// 承办人编码 + /// + public string czrybm { get; set; } + /// + /// 单位编号 + /// + public string dwbm { get; set; } + public string jwgksxid { get; set; } + /// + /// 申请人类型代码 + /// + public string sqrlxdm { get; set; } + /// + /// 申请人名称 + /// + public string sqrmc { get; set; } + /// + /// 申请日期 + /// + public string sqrq { get; set; } + /// + /// 申请人身份代码 + /// + public string sqrsfdm { get; set; } + /// + /// 事项类型代码 + /// + public string sxlxdm { get; set; } + /// + /// 事项类型名称 + /// + public string sxlxmc { get; set; } + /// + /// 当事人 + /// + public string zrrmc { get; set; } + } + + + public class ApplyMarKingBackDto + { + + public ApplyMarKingDto ApplyMarKingDto { get; set; } + + + public string sxbh { get; set; } + + } +} diff --git a/Dto/ArrangeDto.cs b/Dto/ArrangeDto.cs new file mode 100644 index 0000000..50fa93e --- /dev/null +++ b/Dto/ArrangeDto.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dto +{ + public class ArrangeDto + { + /// + /// 必要 + /// + public string bhdlbh { get; set; } + /// + /// 部门受案号 + /// + public string bmsah { get; set; } + /// + /// 单位编码 + /// + public string dwbm { get; set; } + public string fydysl { get; set; } + /// + /// 复制方式 + + /// + public string fzfsdm { get; set; } + /// + /// 复制方式 + + /// + public string fzfsmc { get; set; } + /// + /// 卷宗载体形式 + + /// + public string jzztxsdm { get; set; } + /// + /// 卷宗载体形式 + + /// + public string jzztxsmc { get; set; } + /// + /// 事项编号 + /// + public string sxbh { get; set; } + /// + /// 阅卷方式 + /// + public string yjfsdm { get; set; } + /// + /// 阅卷方式 + /// + public string yjfsmc { get; set; } + /// + /// j结束时间 + /// + public string yjjzsj { get; set; } + /// + /// 开始时间 + /// + public string yjkssj { get; set; } + } +} diff --git a/Dto/SqsDto.cs b/Dto/SqsDto.cs new file mode 100644 index 0000000..6f4e173 --- /dev/null +++ b/Dto/SqsDto.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dto +{ + public class SqsDto + { + public List bhdlSxZlList { get; set; } + public string bhdlbh { get; set; } + public object bhyy { get; set; } + public string bmsah { get; set; } + public string clqkbm { get; set; } + public string clqkmc { get; set; } + public string clrq { get; set; } + public string dwbm { get; set; } + public object dzjztszt { get; set; } + public object dzjzwjmc { get; set; } + public object dzjzxzdz { get; set; } + public object dzjzxzzys { get; set; } + public object dzjzzzid { get; set; } + public object dzjzzzjd { get; set; } + public object dzjzzzwcsj { get; set; } + public object fkwslj { get; set; } + public object fkwsmc { get; set; } + public object fkwsslbh { get; set; } + public object fwqwjmc { get; set; } + public object jwgksxid { get; set; } + public string sqrq { get; set; } + public object sqsxly { get; set; } + /// + /// 序号 + /// + public string sxbh { get; set; } + public string sxlxdm { get; set; } + public string sxlxmc { get; set; } + public int sxqx { get; set; } + public object sysx { get; set; } + public string zt { get; set; } + } +} diff --git a/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache b/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache deleted file mode 100644 index 682e218..0000000 --- a/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -24467ac260176f765658abbc64d2580ba42c4bc0 diff --git a/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache b/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache deleted file mode 100644 index f0352d1..0000000 Binary files a/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache and /dev/null differ diff --git a/WebApplication1/Controllers/TwentySystemController.cs b/WebApplication1/Controllers/TwentySystemController.cs index a76e10e..616f4f1 100644 --- a/WebApplication1/Controllers/TwentySystemController.cs +++ b/WebApplication1/Controllers/TwentySystemController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.Win32; using Newtonsoft.Json; +using System; using System.Collections.Specialized; using System.Data; using System.Dynamic; @@ -505,6 +506,67 @@ namespace WebApplication1.Controllers return result; } + /// + /// б + /// + /// + /// + /// + /// + [HttpGet("DsrList")] + public async Task> DsrList(string Bmsah, string UnitCode, string PartyIdCard) + { + ResultDataDto result = new ResultDataDto(); + var findAjgldsrxx = new + { + bmsah = Bmsah, + dwbm = UnitCode, + gjz = PartyIdCard, + pageNum = 1, + pageSize = 20 + }; + //Ϣ + var dsrrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlGl/findAjgldsrxx", findAjgldsrxx); + var dsrResult = await dsrrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var dsrModel = JsonConvert.DeserializeObject>(dsrResult); + if (dsrModel.success == false && dsrModel.code != "0" && dsrModel.data.list.Count == 0) + { + result.success = false; + result.message = "ݲ"; + return result; + } + return dsrModel; + + } + + + /// + /// + /// + /// + /// + [HttpGet("LsList")] + public async Task> LsList(string ProposerZJHM) + { + ResultDataDto result = new ResultDataDto(); + ///Ϣ + var findSqrxx = new + { + gjz = 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>(sqrRuslt); + if (SqrDto.success == false && SqrDto.code != "0" && SqrDto.data.content.Count == 0) + { + result.success = false; + result.message = "ʦݲ"; + return result; + } + return SqrDto; + } /// /// Ǽ @@ -512,9 +574,9 @@ namespace WebApplication1.Controllers /// /// [HttpPost("Register")] - public async Task Register([FromBody] RegisterDto dto) + public async Task> Register([FromBody] RegisterDto dto) { - Result result = new Result(); + Result result = new Result(); #region ж if (dto == null) { @@ -566,7 +628,6 @@ namespace WebApplication1.Controllers } #endregion - UploadImageDto uploadImageDto = new UploadImageDto() { pageSize = 10, @@ -718,10 +779,230 @@ namespace WebApplication1.Controllers }; var addrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/saveBhdlDjxx", saveBhdlDjxxDto); var addRuslt = await addrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var resultStringDto = JsonConvert.DeserializeObject(addRuslt); + if (resultStringDto.success == false || resultStringDto.code != "0") + { + result.IsSucceed = false; + result.Message = resultStringDto.message; + return result; + } + result.IsSucceed = true; + result.result = saveBhdlDjxxDto; + return result; } + result.IsSucceed = true; return result; } + /// + /// ľ + /// + /// + [HttpPost("ApplyMarKing")] + public async Task> ApplyMarKing([FromBody] ApplyMarKingDto dto) + { + Result result = new Result(); + + #region ж + + if (dto == null) + { + result.IsSucceed = false; + result.Message = "ʧ"; + return result; + } + + if (string.IsNullOrEmpty(dto.sqrq)) + { + result.IsSucceed = false; + result.Message = "ڲΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.bmsah)) + { + result.IsSucceed = false; + result.Message = "ܰŲΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.czr)) + { + result.IsSucceed = false; + result.Message = "а˲Ϊ"; + return result; + } + if (string.IsNullOrEmpty(dto.czrybm)) + { + result.IsSucceed = false; + result.Message = "а˱벻Ϊ"; + return result; + } + if (string.IsNullOrEmpty(dto.dwbm)) + { + result.IsSucceed = false; + result.Message = "λŲΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.sqrlxdm)) + { + result.IsSucceed = false; + result.Message = "ʹ벻Ϊ"; + return result; + } + if (string.IsNullOrEmpty(dto.sqrmc)) + { + result.IsSucceed = false; + result.Message = "ƲΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.sqrsfdm)) + { + result.IsSucceed = false; + result.Message = "ݴ벻Ϊ"; + return result; + } + if (string.IsNullOrEmpty(dto.sxlxdm)) + { + result.IsSucceed = false; + result.Message = "ʹ벻Ϊ"; + return result; + } + if (string.IsNullOrEmpty(dto.sxlxmc)) + { + result.IsSucceed = false; + result.Message = "ƲΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.zrrmc)) + { + result.IsSucceed = false; + result.Message = "˲Ϊ"; + return result; + } + + #endregion + UploadImageDto uploadImageDto = new UploadImageDto() + { + pageSize = 10, + pageNum = 1, + blzt = 0, + dwbm = dto.dwbm, + 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(findBhdlGzbl); + if (resultGzbl.success == false && resultGzbl.code != "0") + { + result.IsSucceed = false; + result.Message = "ݲ"; + return result; + } + + dto.bhdlbh = resultGzbl.data.coumment.FirstOrDefault()?.bhdlbh; + dto.clqkbm = ""; + dto.clqkmc = ""; + dto.jwgksxid = ""; + var queryrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/addBhdlSqsx", dto); + var query = await queryrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var queryModel = JsonConvert.DeserializeObject(query); + if (queryModel.code != "0" || queryModel.success == false) + { + result.IsSucceed = false; + result.Message = queryModel.message; + return result; + } + + + var value = new + { + bhdlbh = dto.bhdlbh, + bmsah = dto.bmsah, + dwbm = dto.dwbm + + }; + var httpResponseMessage = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/findBhdlSqsxList", dto); + var findBhdlSqsxList = await httpResponseMessage.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var resultDataDto = JsonConvert.DeserializeObject>>(findBhdlSqsxList); + + result.IsSucceed = true; + result.result = new ApplyMarKingBackDto() + { + ApplyMarKingDto = dto, + sxbh = resultDataDto.data.FirstOrDefault()?.sxbh + }; + return result; + } + + + /// + ///ľ + /// + /// + /// + [HttpPost("Arrange")] + public async Task Arrange([FromBody] ArrangeDto dto) + { + Result result = new Result(); + + #region ж + if (dto == null) + { + result.IsSucceed = false; + result.Message = "ʧ"; + return result; + } + if (string.IsNullOrEmpty(dto.bhdlbh)) + { + result.IsSucceed = false; + result.Message = "bhdlbhΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.bmsah)) + { + result.IsSucceed = false; + result.Message = "ܰŲΪ"; + return result; + } + if (string.IsNullOrEmpty(dto.yjjzsj)) + { + result.IsSucceed = false; + result.Message = "¼Ϊ"; + return result; + } + if (string.IsNullOrEmpty(dto.yjkssj)) + { + result.IsSucceed = false; + result.Message = "ʼʱ䲻Ϊ"; + return result; + } + #endregion + + dto.fzfsdm = string.IsNullOrEmpty(dto.fzfsdm) ? "1409187800004" : dto.fzfsdm; + dto.fzfsmc = string.IsNullOrEmpty(dto.fzfsmc) ? "¼" : dto.fzfsmc; + dto.jzztxsdm = string.IsNullOrEmpty(dto.jzztxsdm) ? "1407187600002" : dto.jzztxsdm; + dto.jzztxsmc = string.IsNullOrEmpty(dto.jzztxsmc) ? "Ӿ" : dto.jzztxsmc; + dto.yjfsdm = string.IsNullOrEmpty(dto.yjfsdm) ? "1408187700001" : dto.yjfsdm; + dto.yjfsmc = string.IsNullOrEmpty(dto.yjfsmc) ? "" : dto.yjfsmc; + + var request = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/saveYjap", dto); + var findBhdlGzbl = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var resultGzbl = JsonConvert.DeserializeObject(findBhdlGzbl); + if (resultGzbl.success == false && resultGzbl.code != "0") + { + result.IsSucceed = false; + result.Message = "ݲ"; + return result; + } + return result; + } /// Stream ת byte[] private static byte[] StreamToBytes(Stream stream) { diff --git a/WebApplication1/Models/ResultDto.cs b/WebApplication1/Models/ResultDto.cs index eeb0d64..486ed90 100644 --- a/WebApplication1/Models/ResultDto.cs +++ b/WebApplication1/Models/ResultDto.cs @@ -35,4 +35,40 @@ namespace WebApplication1.Models public T data { get; set; } } + + public class ResultboolDto { + + /// + /// + /// + public string code { get; set; } + /// + /// + /// + public bool success { get; set; } + /// + /// 获取成功 + /// + public string message { get; set; } + + public bool data { get; set; } + } + public class ResultStringDto + { + + /// + /// + /// + public string code { get; set; } + /// + /// + /// + public bool success { get; set; } + /// + /// 获取成功 + /// + public string message { get; set; } + + public string data { get; set; } + } }