合并代码

.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

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
+    {
+        /// <summary>
+        /// 必要
+        /// </summary>
+        public string bhdlbh { get; set; }
+        /// <summary>
+        /// 部门受案号
+        /// </summary>
+        public string bmsah { get; set; }
+        public string clqkbm { get; set; }
+        public string clqkmc { get; set; }
+        /// <summary>
+        /// 承办人
+        /// </summary>
+        public string czr { get; set; }
+        /// <summary>
+        /// 承办人编码
+        /// </summary>
+        public string czrybm { get; set; }
+        /// <summary>
+        /// 单位编号
+        /// </summary>
+        public string dwbm { get; set; }
+        public string jwgksxid { get; set; }
+        /// <summary>
+        /// 申请人类型代码
+        /// </summary>
+        public string sqrlxdm { get; set; }
+        /// <summary>
+        /// 申请人名称
+        /// </summary>
+        public string sqrmc { get; set; }
+        /// <summary>
+        /// 申请日期
+        /// </summary>
+        public string sqrq { get; set; }
+        /// <summary>
+        /// 申请人身份代码
+        /// </summary>
+        public string sqrsfdm { get; set; }
+        /// <summary>
+        /// 事项类型代码
+        /// </summary>
+        public string sxlxdm { get; set; }
+        /// <summary>
+        /// 事项类型名称
+        /// </summary>
+        public string sxlxmc { get; set; }
+        /// <summary>
+        /// 当事人
+        /// </summary>
+        public string zrrmc { get; set; }
+    }
+}

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
+    {
+        /// <summary>
+        /// 必要
+        /// </summary>
+        public string bhdlbh { get; set; }
+        /// <summary>
+        /// 部门受案号
+        /// </summary>
+        public string bmsah { get; set; }
+        public string clqkbm { get; set; }
+        public string clqkmc { get; set; }
+        /// <summary>
+        /// 承办人
+        /// </summary>
+        public string czr { get; set; }
+        /// <summary>
+        /// 承办人编码
+        /// </summary>
+        public string czrybm { get; set; }
+        /// <summary>
+        /// 单位编号
+        /// </summary>
+        public string dwbm { get; set; }
+        public string jwgksxid { get; set; }
+        /// <summary>
+        /// 申请人类型代码
+        /// </summary>
+        public string sqrlxdm { get; set; }
+        /// <summary>
+        /// 申请人名称
+        /// </summary>
+        public string sqrmc { get; set; }
+        /// <summary>
+        /// 申请日期
+        /// </summary>
+        public string sqrq { get; set; }
+        /// <summary>
+        /// 申请人身份代码
+        /// </summary>
+        public string sqrsfdm { get; set; }
+        /// <summary>
+        /// 事项类型代码
+        /// </summary>
+        public string sxlxdm { get; set; }
+        /// <summary>
+        /// 事项类型名称
+        /// </summary>
+        public string sxlxmc { get; set; }
+        /// <summary>
+        /// 当事人
+        /// </summary>
+        public string zrrmc { get; set; }
+    }
+
+
+    public class ApplyMarKingBackDto
+    {
+
+        public ApplyMarKingDto ApplyMarKingDto { get; set; }
+
+
+        public string sxbh { get; set; }
+
+    }
+}

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
+    {
+        /// <summary>
+        /// 必要
+        /// </summary>
+        public string bhdlbh { get; set; }
+        /// <summary>
+        /// 部门受案号
+        /// </summary>
+        public string bmsah { get; set; }
+        /// <summary>
+        /// 单位编码
+        /// </summary>
+        public string dwbm { get; set; }
+        public string fydysl { get; set; }
+        /// <summary>
+        /// 复制方式
+
+        /// </summary>
+        public string fzfsdm { get; set; }
+        /// <summary>
+        /// 复制方式
+
+        /// </summary>
+        public string fzfsmc { get; set; }
+        /// <summary>
+        /// 卷宗载体形式
+
+        /// </summary>
+        public string jzztxsdm { get; set; }
+        /// <summary>
+        /// 卷宗载体形式
+
+        /// </summary>
+        public string jzztxsmc { get; set; }
+        /// <summary>
+        /// 事项编号
+        /// </summary>
+        public string sxbh { get; set; }
+        /// <summary>
+        /// 阅卷方式
+        /// </summary>
+        public string yjfsdm { get; set; }
+        /// <summary>
+        /// 阅卷方式
+        /// </summary>
+        public string yjfsmc { get; set; }
+        /// <summary>
+        /// j结束时间
+        /// </summary>
+        public string yjjzsj { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string yjkssj { get; set; }
+    }
+}

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<object> 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; }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        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; }
+    }
+}

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

@@ -1 +0,0 @@
-24467ac260176f765658abbc64d2580ba42c4bc0

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;
         }
 
+        /// <summary>
+        /// 当事人列表
+        /// </summary>
+        /// <param name="Bmsah"></param>
+        /// <param name="UnitCode"></param>
+        /// <param name="PartyIdCard"></param>
+        /// <returns></returns>
+        [HttpGet("DsrList")]
+        public async Task<ResultDataDto<AjgldsrxxDto>> DsrList(string Bmsah, string UnitCode, string PartyIdCard)
+        {
+            ResultDataDto<AjgldsrxxDto> result = new ResultDataDto<AjgldsrxxDto>();
+            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<ResultDataDto<AjgldsrxxDto>>(dsrResult);
+            if (dsrModel.success == false && dsrModel.code != "0" && dsrModel.data.list.Count == 0)
+            {
+                result.success = false;
+                result.message = "当事人数据不存在";
+                return result;
+            }
+            return dsrModel;
+
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ProposerZJHM"></param>
+        /// <returns></returns>
+        [HttpGet("LsList")]
+        public async Task<ResultDataDto<FindSqrxxDto>> LsList(string ProposerZJHM)
+        {
+            ResultDataDto<FindSqrxxDto> result = new ResultDataDto<FindSqrxxDto>();
+            ///申请人信息
+            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<ResultDataDto<FindSqrxxDto>>(sqrRuslt);
+            if (SqrDto.success == false && SqrDto.code != "0" && SqrDto.data.content.Count == 0)
+            {
+                result.success = false;
+                result.message = "律师数据不存在";
+                return result;
+            }
+            return SqrDto;
+        }
 
         /// <summary>
         /// µÇ¼Ç
@@ -512,9 +574,9 @@ namespace WebApplication1.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("Register")]
-        public async Task<Result> Register([FromBody] RegisterDto dto)
+        public async Task<Result<SaveBhdlDjxxDto>> Register([FromBody] RegisterDto dto)
         {
-            Result result = new Result();
+            Result<SaveBhdlDjxxDto> result = new Result<SaveBhdlDjxxDto>();
             #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<ResultStringDto>(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;
         }
 
+        /// <summary>
+        /// 申请阅卷
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("ApplyMarKing")]
+        public async Task<Result<ApplyMarKingBackDto>> ApplyMarKing([FromBody] ApplyMarKingDto dto)
+        {
+            Result<ApplyMarKingBackDto> result = new Result<ApplyMarKingBackDto>();
+
+            #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<ResultGzbl>(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<ResultboolDto>(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<ResultDataDto<List<SqsDto>>>(findBhdlSqsxList);
+
+            result.IsSucceed = true;
+            result.result = new ApplyMarKingBackDto()
+            {
+                ApplyMarKingDto = dto,
+                sxbh = resultDataDto.data.FirstOrDefault()?.sxbh
+            };
+            return result;
+        }
+
+
+        /// <summary>
+        ///安排阅卷
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost("Arrange")]
+        public async Task<Result> 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<ResultStringDto>(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)
         {

WebApplication1/Models/ResultDto.cs

@@ -35,4 +35,40 @@ namespace WebApplication1.Models
 
         public T data { get; set; }
     }
+
+    public class ResultboolDto {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool success { get; set; }
+        /// <summary>
+        /// 获取成功
+        /// </summary>
+        public string message { get; set; }
+
+        public bool data { get; set; }
+    }
+    public class ResultStringDto
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool success { get; set; }
+        /// <summary>
+        /// 获取成功
+        /// </summary>
+        public string message { get; set; }
+
+        public string data { get; set; }
+    }
 }