diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs new file mode 100644 index 0000000..44b02d8 --- /dev/null +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -0,0 +1,357 @@ +using AutoMapper; +using com.sun.xml.@internal.bind.v2.model.core; +using Elight.Entity; +using Elight.Entity.APPDto.Lawyer; +using Elight.Entity.AppMode.Lawyer; +using Elight.Logic; +using Elight.Logic.Model.Lawyer; +using Elight.Utility; +using Elight.Utility.Code; +using Elight.Utility.Extensions; +using Elight.Utility.logs; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using System.Net.WebSockets; +using System.Text; +using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion; +using User = Elight.Utility.User; + +namespace _24Hour.Controllers.Common +{ + /// + /// 律师服务 + /// + [Authorize] + [ApiController] + [Route("api/Lawyer")] + public class LawyerArchivesController : Controller + { + #region Identity + private readonly SqlSugarClient _db;//数据库 + private readonly WriteSysLog _logs;//操作日志 + App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 + private readonly ILogger _logger;//日志 + Result result = new Result(); + + private readonly IMapper mapper; + public LawyerArchivesController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper) + { + this._logger = logger; + _db = db; + _logs = logs; + _userdata = user.Userdata(); + this.mapper = _mapper; + } + #endregion + + + + #region 律师阅卷 + /// + /// 加密二维码信息 + /// + /// + [HttpGet] + [Route("EncodeData")] + public async Task EncodeData(string id) + { + var data = await _db.Queryable().LeftJoin((lawyer, user) => lawyer.createuserId == user.Id) + .Where(lawyer => lawyer.Id == id) + .Select((lawyer, user) => new + { + info = lawyer, + user + }).FirstAsync(); + if (data != null) + { + var dto = new + { + info = mapper.Map(data.info), + user = mapper.Map(data.user) + }; + var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto))); + result.IsSucceed = true; + result.result = encodingdata; + } + return result; + } + + /// + /// 解码二维码信息 + /// + /// + [HttpPost] + [Route("DecodeQRData")] + public Task DecodeQRData(DecodeData data) + { + try + { + var basestr = Convert.FromBase64String(data.EncodingString); + var str = Encoding.UTF8.GetString(basestr); + + var model = str.ConvertToAnonymousType(new + { + info = default(QRLawyerServiceDto), + user = default(QRUserDto) + }); + result.IsSucceed = true; + result.result = model; + } + catch (Exception ex) + { + result.IsSucceed = false; + } + return Task.FromResult(result); + } + /// + /// 同步外网律师人员信息(未完成) (根据律师身份证号更新或新增用户信息) + /// + /// + /// + [HttpPost] + [Route("AddUserInfo")] + public async Task AddUserInfo(App_Sys_UserModel user) + { + try + { + var data = await _db.Queryable().FirstAsync(x => x.cardId == user.cardId); + if (data != null) + { + //update + _db.BeginTran(); + var num = await _db.Updateable(user).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "修改成功"; + } + } + else + { + //insert + _db.BeginTran(); + var num = await _db.Insertable(user).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.Message = "添加成功"; + } + else + { + result.IsSucceed = false; + result.Message = "添加失败"; + } + } + } + catch + { + result.IsSucceed = false; + } + return result; + } + /// + /// 同步外网预约信息（未完成） + /// + /// + /// + [HttpPost] + [Route("AddLawyerServiceInfo")] + public async Task AddLawyerServiceInfo(App_LawyerServicesModel info) + { + var data = await _db.Queryable().FirstAsync(x => x.Id == info.Id); + if (data != null) + { + result.IsSucceed = true; + result.Message = "改数据已同步"; + return result; + } + else + { + _db.BeginTran(); + var num = await _db.Insertable(info).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.Message = "添加成功"; + result.result = mapper.Map(info); + return result; + } + else + { + result.IsSucceed = false; + result.Message = "添加失败"; + return result; + } + + } + } + /// + /// 查询律师阅卷信息 + /// + /// + /// + [HttpGet] + [Route("QueryLawyerArchives")] + public async Task QueryLawyerArchives(LawyerArchivesInput input) + { + RefAsync totalNumber = 0;//总数据 + //查询律师服务 + var list = await _db.Queryable().LeftJoin((archives, services) => archives.lawyerservicesId == services.Id) + .WhereIF(input.bmsah != null, (archives, services) => archives.bmsah == input.bmsah) + .WhereIF(input.lawyerId != null, (archives, services) => archives.lawyerId == input.lawyerId) + .WhereIF(input.lawyerservicesId != null, (archives, services) => archives.lawyerservicesId == input.lawyerservicesId) + .WhereIF(input.Id != null, (archives, services) => archives.Id == input.Id) + .WhereIF(input.unitCode != null, (archives, services) => services.unitCode == input.unitCode) + .WhereIF(input.receptionuserId != null, (archives, services) => services.receptionuser == input.receptionuserId) + .WhereIF(input.state != null, (archives, services) => services.state == input.state) + .ToPageListAsync(input.PageIndex, input.PageSize, totalNumber); + + input.RowsCount = totalNumber; + var data = new QueryResult(input, list.OrderByDescending(q => q.createTime).ToList()); + result.IsSucceed = true; + result.result = data; + return result; + } + + public class DecodeData + { + public string EncodingString { get; set; } + } + /// + /// 新增阅卷信息 + /// + /// + /// + [HttpPost] + [Route("AddLawyerArchives")] + public async Task AddLawyerArchives(LawyerArchivesDto dto) + { + try + { + var data = await _db.Queryable().FirstAsync(x => x.lawyerservicesId == dto.lawyerservicesId); + if (data != null) + { + result.IsSucceed = false; + result.Message = "该预约信息已经处理，无法再次新建阅卷预约"; + return result; + } + var entity = mapper.Map(dto); + + entity.Id = Guid.NewGuid().ToString(); + entity.createrId = _userdata.Id; + entity.createTime = DateTime.Now; + + _db.BeginTran(); + var num = await _db.Insertable(entity).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.Message = "添加成功"; + result.result = mapper.Map(entity); + } + } + catch + { + result.IsSucceed = false; + } + return result; + } + /// + /// 删除律师阅卷信息 + /// + /// + /// + [HttpPost] + [Route("DeleteLawyerArchives")] + public async Task DeleteLawyerArchives(CurrencyDelete Currency) + { + try + { + _db.BeginTran(); + var Deletelist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync(); + Deletelist.ForEach(q => + { + q.IsDeleted = 1; + }); + var num = await _db.Updateable(Deletelist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "删除成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + LogService.WriteLog(ex, "删除律师阅卷预约"); + } + _logs.WriteSysLogadd("律师阅卷服务", "删除律师阅卷预约", result, _db); + return result; + } + /// + /// 修改律师阅卷信息 + /// + /// + /// + [HttpPost] + [Route("UpdateLawyerArchives")] + public async Task UpdateLawyerArchives(LawyerArchivesDto Lawyerdata) + { + try + { + _db.BeginTran(); + var num = await _db.Updateable(Lawyerdata).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "修改成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + LogService.WriteLog(ex, "删除律师阅卷预约"); + } + _logs.WriteSysLogadd("律师阅卷服务", "删除律师阅卷预约", result, _db); + return result; + } + /// + /// 从2.0系统查询案件信息（未完成） + /// + /// + /// + [HttpGet] + [Route("QueryCaseFromtwenty")] + public Task QueryCaseFromtwenty(string bmsah,string idcard,string name,string casename) + { + return Task.FromResult(result); + } + + /// + /// 添加卷宗信息 + /// + /// + /// + [HttpPost] + [Route("AddArchivesInfo")] + public Task> AddArchivesInfo(JZJBXXDto dto) + { + Result res = new Result(); + return Task.FromResult(res); + } + + #endregion + } +} \ No newline at end of file diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index 7c69df4..61af5ec 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -1,4 +1,6 @@ -using Elight.Entity; +using com.sun.xml.@internal.bind.v2.model.core; +using Elight.Entity; +using Elight.Entity.APPDto.Lawyer; using Elight.Logic; using Elight.Utility; using Elight.Utility.Code; @@ -6,9 +8,13 @@ using Elight.Utility.Extensions; using Elight.Utility.logs; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; using SqlSugar; -using System.Net.WebSockets; +using System.Net.WebSockets; +using System.Text; +using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion; using static java.security.cert.CertPathValidatorException; +using User = Elight.Utility.User; namespace _24Hour.Controllers.Common { @@ -20,6 +26,7 @@ namespace _24Hour.Controllers.Common [Route("api/Lawyer")] public class LawyerservicesController : Controller { + private static Dictionary CONNECT_POOL = new Dictionary();//用户连接池 #region Identity private readonly SqlSugarClient _db;//数据库 @@ -80,7 +87,7 @@ namespace _24Hour.Controllers.Common .WhereIF(Lawyerdata.unitId != null, q => q.unitCode.Contains(Lawyerdata.unitId)) .WhereIF(Lawyerdata.state != null, q => q.state == Lawyerdata.state) .WhereIF(Lawyerdata.StartTime != null && Lawyerdata.EndTime != null, q => q.receptiontime >= Lawyerdata.StartTime && q.receptiontime < Lawyerdata.EndTime.Value.AddDays(1)) - .Where(q => q.IsDeleted == 0&&q.unitCode == _userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber); + .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber); Lawyerdata.RowsCount = totalNumber; var data = new QueryResult(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList()); result.IsSucceed = true; @@ -109,7 +116,6 @@ namespace _24Hour.Controllers.Common result.IsSucceed = true; result.result = "添加成功"; } - } catch (System.Exception ex) { @@ -183,15 +189,19 @@ namespace _24Hour.Controllers.Common _db.RollbackTran(); result.IsSucceed = false; result.Message = ex.Message; - LogService.WriteLog(ex, "删除律师服务预约"); + LogService.WriteLog(ex, "删除律师阅卷"); } _logs.WriteSysLogadd("律师服务", "删除律师服务预约", result, _db); return result; - } + } #endregion - + + + + + #region 律师预约修改办理人及状态修改 - + /// /// 修改律师服务预约办理人 /// @@ -204,8 +214,8 @@ namespace _24Hour.Controllers.Common { try { - var Lawyerbol = await _db.Queryable().Where(q=>q.Id==Id).ToListAsync(); - if (Lawyerbol.Count()>0) + var Lawyerbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync(); + if (Lawyerbol.Count() > 0) { Lawyerbol.FirstOrDefault().receptionuser = transactors; _db.BeginTran(); @@ -244,7 +254,7 @@ namespace _24Hour.Controllers.Common /// [HttpGet] [Route("UpdateLawyerstate")] - public async Task UpdateLawyerstate(string? Id, int state,string? reason) + public async Task UpdateLawyerstate(string? Id, int state, string? reason) { try { @@ -252,11 +262,11 @@ namespace _24Hour.Controllers.Common if (Lawyerbol.Any()) { Lawyerbol.FirstOrDefault().state = state; - if(reason.NotNull()) - Lawyerbol.FirstOrDefault().reason = reason; + if (reason.NotNull()) + Lawyerbol.FirstOrDefault().reason = reason; Lawyerbol.FirstOrDefault().acceptancetime = DateTime.Now; _db.BeginTran(); - var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.state, it.reason,it.acceptancetime }).ExecuteCommandAsync(); + var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.state, it.reason, it.acceptancetime }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { diff --git a/24Hour/Program.cs b/24Hour/Program.cs index 1deca67..deb7a70 100644 --- a/24Hour/Program.cs +++ b/24Hour/Program.cs @@ -61,8 +61,14 @@ builder.Services.AddSwaggerGen(c => c.OrderActionsBy(o => o.RelativePath); var basePath = System.AppDomain.CurrentDomain.BaseDirectory;//ȡӦóĿ¼ԣܹĿ¼Ӱ죬ô˷ȡ· var xmlPath = Path.Combine(basePath, "24Hour.xml"); + var xmlPathentity = Path.Combine(basePath, "Elight.Entity.xml"); + var xmlPathlogic = Path.Combine(basePath, "Elight.Logic.xml"); if (File.Exists(xmlPath))//ûиļʱ - c.IncludeXmlComments(xmlPath, true); + c.IncludeXmlComments(xmlPath, true); + if (File.Exists(xmlPathentity))//ûиļʱ + c.IncludeXmlComments(xmlPathentity, true); + if (File.Exists(xmlPathlogic))//ûиļʱ + c.IncludeXmlComments(xmlPathlogic, true); //Jwt֤ c.AddSecurityRequirement(new OpenApiSecurityRequirement() { @@ -252,6 +258,7 @@ app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "24Сʱһ API V1"); c.RoutePrefix = string.Empty; + }); #endregion diff --git a/Elight.Entity/APPDto/App_LawyerServicesDto.cs b/Elight.Entity/APPDto/App_LawyerServicesDto.cs index f854124..abc3d63 100644 --- a/Elight.Entity/APPDto/App_LawyerServicesDto.cs +++ b/Elight.Entity/APPDto/App_LawyerServicesDto.cs @@ -51,6 +51,11 @@ namespace Elight.Entity [DataMember] public DateTime? acceptancetime { get; set; } + /// + /// 访问结束时间 + /// + public DateTime? receptionEndtime { get; set; } + /// /// 访问事由 /// @@ -137,5 +142,17 @@ namespace Elight.Entity /// [DataMember] public string? unitName { get; set; } + + /// + /// 当事人姓名 + /// + [DataMember] + public string party { get;set;} + + /// + /// 当事人身份证 + /// + [DataMember] + public string partyIDcard { get;set;} } } diff --git a/Elight.Entity/APPDto/Lawyer/JZJBXX.cs b/Elight.Entity/APPDto/Lawyer/JZJBXX.cs new file mode 100644 index 0000000..4372522 --- /dev/null +++ b/Elight.Entity/APPDto/Lawyer/JZJBXX.cs @@ -0,0 +1,57 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.APPDto.Lawyer +{ + /// + /// 卷宗基本信息 + /// + public class JZJBXXDto + { + /// + /// 部门受案号 v + /// + public string Id { get; set; } + + public string bmsah { get; set; } + + /// + /// 卷宗编号v + /// + public string jzbh { get; set; } + + /// + /// 单位编码 + /// + public string dwbm { get; set; } + + /// + /// （简案）王奇涉嫌危险驾驶案 v + /// + public string jzmc { get; set; } + + /// + /// 卷宗制作人 + /// + public string jzzzr { get; set; } + + /// + /// 案件类别编码 + /// + public string ajlbbm { get; set; } + /// + /// 案件类别名称 + /// + public string ajlbmc { get; set; } + /// + /// 卷宗目录 v + /// + + public List jzml { get; set; } + } +} diff --git a/Elight.Entity/APPDto/Lawyer/JZML.cs b/Elight.Entity/APPDto/Lawyer/JZML.cs new file mode 100644 index 0000000..35c6866 --- /dev/null +++ b/Elight.Entity/APPDto/Lawyer/JZML.cs @@ -0,0 +1,67 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.APPDto.Lawyer +{ + + + /// + /// 卷宗目录 + /// + public class JZMLDto + { + /// + /// + /// + public string taskid { get; set; } + + /// + /// 卷宗编号 + /// + public string jzbh { get; set; } + + /// + /// 目录编号 + /// + public string mlbh { get; set; } + + /// + /// 父目录编号 + /// + public string fmlbh { get; set; } + + /// + /// 目录显示名称 + /// + public string mlxsmc { get; set; } + + /// + /// 目录信息 + /// + public string mlxx { get; set; } + + /// + /// 目录顺序号 + /// + public string mlsxh { get; set; } + + /// + /// 目录类型 卷，目录看，文件 + /// + public string mllx { get; set; } + + /// + /// 单位编码 + /// + public string dwbm { get; set; } + public List jzwj { get; set; } + } + + + +} diff --git a/Elight.Entity/APPDto/Lawyer/JZWJItem.cs b/Elight.Entity/APPDto/Lawyer/JZWJItem.cs new file mode 100644 index 0000000..a5fa773 --- /dev/null +++ b/Elight.Entity/APPDto/Lawyer/JZWJItem.cs @@ -0,0 +1,106 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.APPDto.Lawyer +{ + + /// + /// 卷宗文件 + /// + public class JZWJItemDto + { + /// + /// 文件唯一标识 + /// + public string Id { get; set; } + public string wjxh { get; set; } + + /// + /// 目录编号 + /// + public string mlbh { get; set; } + + /// + /// 源文件路径 + /// + public string ywjlj { get; set; } + + /// + /// 缩略图文件路径 + /// + public string sltwjlj { get; set; } + + /// + /// pdf文件路径 + /// + public string pdfwjlj { get; set; } + + /// + /// 图片实际显示路径！ + /// + public string jpgwjlj { get; set; } + + /// + /// 文件页码 + /// + public string wjym { get; set; } + + /// + /// 文件类型 + /// + public string wjlx { get; set; } + + /// + /// + /// + public string wjscbz { get; set; } + + /// + /// 文件顺序号 排序 + /// + public int wjsxh { get; set; } + + /// + /// 文件显示名称 第二页 + /// + public string wjxsmc { get; set; } + + /// + /// 卷宗编号 + /// + public string jzbh { get; set; } + + /// + /// 文件ocr识别状态 + /// + public string wjocrsbzt { get; set; } + + /// + /// 创建时间 + /// + public string cjsj { get; set; } + + /// + /// 上传时间 + /// + public string time { get; set; } + + + public string taskid { get; set; } + + /// + /// 文件标识 + /// + public string wjbs { get; set; } + + /// + /// 标识编号 + /// + public string bsbh { get; set; } + } +} diff --git a/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs b/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs new file mode 100644 index 0000000..fdcb489 --- /dev/null +++ b/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs @@ -0,0 +1,81 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.APPDto.Lawyer +{ + public class LawyerArchivesDto + { + [DataMember] + public string? Id { get; set; } + /// + /// 预约记录Id + /// + [DataMember] + public string? lawyerservicesId { get; set; } + /// + /// 卷宗id + /// + [DataMember] + public string? jzlbxxId { get; set; } + /// + /// 部门受案号 + /// + [DataMember] + public string? bmsah { get; set; } + /// + /// 律师Id + /// + [DataMember] + public string? lawyerId { get; set; } + /// + /// 律师名字 + /// + [DataMember] + public string? lawyerName { get; set; } + /// + /// 授权开始查阅时间 + /// + [DataMember] + public DateTime? permissibleStartTime { get; set; } + /// + /// 授权截至查阅时间 + /// + [DataMember] + public DateTime? permissibleEndTime { get; set; } + /// + /// 实际开始查阅时间 + /// + [DataMember] + public DateTime? actualStartTime { get; set; } + /// + /// 实际截至查阅时间 + /// + [DataMember] + public DateTime? actualEndTime { get; set; } + /// + /// 0 待查阅 1查阅中 2 已查阅 + /// + [DataMember] + public ushort? status { get; set; } + /// + /// 0 未复制 1打印 2刻录 3 both + /// + [DataMember] + public ushort? copyStatus { get; set; } + /// + /// 0 不限制 1限制打印 2 限制刻录 3全部禁止 + /// + [DataMember] + public ushort? copyLimit { get; set; } + /// + /// 备注 + /// + [DataMember] + public string? remake { get; set; } + } +} diff --git a/Elight.Entity/APPDto/Lawyer/QRDto.cs b/Elight.Entity/APPDto/Lawyer/QRDto.cs new file mode 100644 index 0000000..b756b04 --- /dev/null +++ b/Elight.Entity/APPDto/Lawyer/QRDto.cs @@ -0,0 +1,37 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.APPDto.Lawyer +{ + public class QRUserDto + { + public string? Id { get; set; } + public string? unitCode { get; set; } + public string? name { get; set; } + public string? phone { get; set; } + public string? cardId { get; set; } + } + public class QRLawyerServiceDto + { + public string? Id { get; set; } + public string? unitCode { get; set; } + public string? phone { get; set; } + public string? matter { get; set; } + public string? reason { get; set; } + public DateTime? acceptancetime { get; set; } + /// + /// 访问对象 + /// + public string? objectstr { get; set; } + public string? reservationId { get; set; } + public string? notes { get; set; } + public int state { get; set; } + public string? createusername { get; set; } + public string? createuserId { get; set; } + } +} diff --git a/Elight.Entity/APPDto/QRTransfter.cs b/Elight.Entity/APPDto/QRTransfter.cs new file mode 100644 index 0000000..cd353ac --- /dev/null +++ b/Elight.Entity/APPDto/QRTransfter.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.APPDto +{ + public class QRTransfterDto + { + + } +} diff --git a/Elight.Entity/AppMode/App_LawyerServicesModel.cs b/Elight.Entity/AppMode/App_LawyerServicesModel.cs index 6087373..43c902a 100644 --- a/Elight.Entity/AppMode/App_LawyerServicesModel.cs +++ b/Elight.Entity/AppMode/App_LawyerServicesModel.cs @@ -48,6 +48,11 @@ namespace Elight.Entity [DataMember] public DateTime? receptiontime { get; set; } + /// + /// 访问结束时间 + /// + public DateTime? receptionEndtime { get; set; } + /// /// 同意受理时间 /// @@ -104,9 +109,9 @@ namespace Elight.Entity /// 创建人Id /// [DataMember] - public string? createuserId { get; set; } - - + public string? createuserId { get; set; } + + /// /// 操作人id /// @@ -134,6 +139,19 @@ namespace Elight.Entity /// 附件 /// [DataMember] - public string annex { get; set; } + public string? annex { get; set; } + + /// + /// 当事人姓名 + /// + [DataMember] + public string? party { get;set;} + + /// + /// 当事人身份证 + /// + [DataMember] + public string? partyIDcard { get;set;} + } } diff --git a/Elight.Entity/AppMode/Lawyer/DossierInfo.cs b/Elight.Entity/AppMode/Lawyer/DossierInfo.cs new file mode 100644 index 0000000..7ecd603 --- /dev/null +++ b/Elight.Entity/AppMode/Lawyer/DossierInfo.cs @@ -0,0 +1,171 @@ +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using System.Text; +//using System.Threading.Tasks; + +//namespace Elight.Entity.AppMode.Lawyer +//{ +// /// +// /// 卷宗基本信息 +// /// +// public class JZJBXX +// { +// /// +// /// 部门受案号 v +// /// +// public string bmsah { get; set; } +// /// +// /// 卷宗编号v +// /// +// public string jzbh { get; set; } +// /// +// /// 单位编码 +// /// +// public string dwbm { get; set; } +// /// +// /// （简案）王奇涉嫌危险驾驶案 v +// /// +// public string jzmc { get; set; } +// /// +// /// 卷宗制作人 +// /// +// public string jzzzr { get; set; } +// /// +// /// 案件类别编码 +// /// +// public string ajlbbm { get; set; } +// /// +// /// 案件类别名称 +// /// +// public string ajlbmc { get; set; } +// /// +// /// 卷宗目录 v +// /// + +// public List jzml { get; set; } +// } + + +// /// +// /// 卷宗目录 +// /// +// public class JZML +// { +// /// +// /// +// /// +// public string taskid { get; set; } +// /// +// /// 卷宗编号 +// /// +// public string jzbh { get; set; } +// /// +// /// 目录编号 +// /// +// public string mlbh { get; set; } +// /// +// /// 父目录编号 +// /// +// public string fmlbh { get; set; } +// /// +// /// 目录显示名称 +// /// +// public string mlxsmc { get; set; } +// /// +// /// 目录信息 +// /// +// public string mlxx { get; set; } +// /// +// /// 目录顺序号 +// /// +// public string mlsxh { get; set; } +// /// +// /// 目录类型 卷，目录看，文件 +// /// +// public string mllx { get; set; } +// /// +// /// 单位编码 +// /// +// public string dwbm { get; set; } +// public List jzwj { get; set; } +// } + + +// /// +// /// 卷宗文件 +// /// +// public class JZWJItem +// { +// /// +// /// 文件唯一标识 +// /// +// public string wjxh { get; set; } +// /// +// /// 目录编号 +// /// +// public string mlbh { get; set; } +// /// +// /// 源文件路径 +// /// +// public string ywjlj { get; set; } +// /// +// /// 缩略图文件路径 +// /// +// public string sltwjlj { get; set; } +// /// +// /// pdf文件路径 +// /// +// public string pdfwjlj { get; set; } +// /// +// /// 图片实际显示路径！ +// /// +// public string jpgwjlj { get; set; } +// /// +// /// 文件页码 +// /// +// public string wjym { get; set; } +// /// +// /// 文件类型 +// /// +// public string wjlx { get; set; } +// /// +// /// +// /// +// public string wjscbz { get; set; } +// /// +// /// 文件顺序号 排序 +// /// +// public int wjsxh { get; set; } +// /// +// /// 文件显示名称 第二页 +// /// +// public string wjxsmc { get; set; } +// /// +// /// 卷宗编号 +// /// +// public string jzbh { get; set; } +// /// +// /// 文件ocr识别状态 +// /// +// public string wjocrsbzt { get; set; } +// /// +// /// 创建时间 +// /// +// public string cjsj { get; set; } +// /// +// /// 上传时间 +// /// +// public string time { get; set; } + +// public string taskid { get; set; } +// /// +// /// 文件标识 +// /// +// public string wjbs { get; set; } +// /// +// /// 标识编号 +// /// +// public string bsbh { get; set; } +// } +//} diff --git a/Elight.Entity/AppMode/Lawyer/JZJBXX.cs b/Elight.Entity/AppMode/Lawyer/JZJBXX.cs new file mode 100644 index 0000000..3e0ec19 --- /dev/null +++ b/Elight.Entity/AppMode/Lawyer/JZJBXX.cs @@ -0,0 +1,60 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.AppMode.Lawyer +{ + /// + /// 卷宗基本信息 + /// + [Serializable] + [DataContract] + [SugarTable("case_jzlbxx")] + public class JZJBXX + { + + [DataMember] + [SugarColumn(IsPrimaryKey = true)] + public string Id { get; set; } + /// + /// 部门受案号 v + /// + + [DataMember] + public string bmsah { get; set; } + [DataMember] + /// + /// 卷宗编号v + /// + public string jzbh { get; set; } + [DataMember] + /// + /// 单位编码 + /// + public string dwbm { get; set; } + [DataMember] + /// + /// （简案）王奇涉嫌危险驾驶案 v + /// + public string jzmc { get; set; } + [DataMember] + /// + /// 卷宗制作人 + /// + public string jzzzr { get; set; } + [DataMember] + /// + /// 案件类别编码 + /// + public string ajlbbm { get; set; } + [DataMember] + /// + /// 案件类别名称 + /// + public string ajlbmc { get; set; } + } +} diff --git a/Elight.Entity/AppMode/Lawyer/JZML.cs b/Elight.Entity/AppMode/Lawyer/JZML.cs new file mode 100644 index 0000000..c3e0a18 --- /dev/null +++ b/Elight.Entity/AppMode/Lawyer/JZML.cs @@ -0,0 +1,70 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.AppMode.Lawyer +{ + + + /// + /// 卷宗目录 + /// + [Serializable] + [DataContract] + [SugarTable("case_jzml")] + public class JZML + { + /// + /// + /// + public string taskid { get; set; } + [DataMember] + /// + /// 卷宗编号 + /// + public string jzbh { get; set; } + [DataMember] + /// + /// 目录编号 + /// + public string mlbh { get; set; } + [DataMember] + /// + /// 父目录编号 + /// + public string fmlbh { get; set; } + [DataMember] + /// + /// 目录显示名称 + /// + public string mlxsmc { get; set; } + [DataMember] + /// + /// 目录信息 + /// + public string mlxx { get; set; } + [DataMember] + /// + /// 目录顺序号 + /// + public string mlsxh { get; set; } + [DataMember] + /// + /// 目录类型 卷，目录看，文件 + /// + public string mllx { get; set; } + [DataMember] + /// + /// 单位编码 + /// + public string dwbm { get; set; } + public List jzwj { get; set; } + } + + + +} diff --git a/Elight.Entity/AppMode/Lawyer/JZWJItem.cs b/Elight.Entity/AppMode/Lawyer/JZWJItem.cs new file mode 100644 index 0000000..3f00d78 --- /dev/null +++ b/Elight.Entity/AppMode/Lawyer/JZWJItem.cs @@ -0,0 +1,112 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.AppMode.Lawyer +{ + + /// + /// 卷宗文件 + /// + [Serializable] + [DataContract] + [SugarTable("case_jzwjitem")] + public class JZWJItem + { + /// + /// 文件唯一标识 + /// + [DataMember] + [SugarColumn(IsPrimaryKey = true)] + public string Id { get; set; } + [DataMember] + public string wjxh { get; set; } + [DataMember] + /// + /// 目录编号 + /// + public string mlbh { get; set; } + [DataMember] + /// + /// 源文件路径 + /// + public string ywjlj { get; set; } + [DataMember] + /// + /// 缩略图文件路径 + /// + public string sltwjlj { get; set; } + [DataMember] + /// + /// pdf文件路径 + /// + public string pdfwjlj { get; set; } + [DataMember] + /// + /// 图片实际显示路径！ + /// + public string jpgwjlj { get; set; } + [DataMember] + /// + /// 文件页码 + /// + public string wjym { get; set; } + [DataMember] + /// + /// 文件类型 + /// + public string wjlx { get; set; } + [DataMember] + /// + /// + /// + public string wjscbz { get; set; } + [DataMember] + /// + /// 文件顺序号 排序 + /// + public int wjsxh { get; set; } + [DataMember] + /// + /// 文件显示名称 第二页 + /// + public string wjxsmc { get; set; } + [DataMember] + /// + /// 卷宗编号 + /// + public string jzbh { get; set; } + [DataMember] + /// + /// 文件ocr识别状态 + /// + public string wjocrsbzt { get; set; } + [DataMember] + /// + /// 创建时间 + /// + public string cjsj { get; set; } + [DataMember] + /// + /// 上传时间 + /// + public string time { get; set; } + [DataMember] + + public string taskid { get; set; } + [DataMember] + /// + /// 文件标识 + /// + public string wjbs { get; set; } + [DataMember] + /// + /// 标识编号 + /// + public string bsbh { get; set; } + } +} diff --git a/Elight.Entity/AppMode/Lawyer/LawyerArchives.cs b/Elight.Entity/AppMode/Lawyer/LawyerArchives.cs new file mode 100644 index 0000000..eb2e040 --- /dev/null +++ b/Elight.Entity/AppMode/Lawyer/LawyerArchives.cs @@ -0,0 +1,55 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.AppMode.Lawyer +{ + [Serializable] + [DataContract] + [SugarTable("case_lawyerarchives")] + public class LawyerArchives + { + [DataMember] + [SugarColumn(IsPrimaryKey = true)] + public string? Id { get; set; } + [DataMember] + public string? lawyerservicesId { get; set; } + [DataMember] + public string? jzlbxxId { get; set; } + [DataMember] + public string? bmsah { get; set; } + [DataMember] + public string? lawyerId { get; set; } + [DataMember] + public string? lawyerName { get; set; } + [DataMember] + public DateTime? permissibleStartTime { get; set; } + [DataMember] + public DateTime? permissibleEndTime { get; set; } + [DataMember] + public DateTime? actualStartTime { get; set; } + [DataMember] + public DateTime? actualEndTime { get; set; } + [DataMember] + public ushort? status { get; set; } + [DataMember] + public ushort? copyStatus { get; set; } + [DataMember] + public ushort? copyLimit { get; set; } + [DataMember] + public string? remake { get; set; } + [DataMember] + public DateTime? createTime { get; set; } + [DataMember] + public string? createrId { get; set; } + /// + /// 是否删除：0：未删除、1：删除 + /// + [DataMember] + public int? IsDeleted { get; set; } = 0; + } +} diff --git a/Elight.Entity/AuthManageProfile.cs b/Elight.Entity/AuthManageProfile.cs index 7b4f39f..1d38428 100644 --- a/Elight.Entity/AuthManageProfile.cs +++ b/Elight.Entity/AuthManageProfile.cs @@ -1,4 +1,6 @@ using AutoMapper; +using Elight.Entity.APPDto.Lawyer; +using Elight.Entity.AppMode.Lawyer; using System; using System.Collections.Generic; using System.Linq; @@ -11,6 +13,30 @@ namespace Elight.Entity { public AuthManageProfile() { + CreateMap().ReverseMap().ForAllMembers(opt => + { + opt.UseDestinationValue(); + opt.Condition((src, dest, srcm, destm) => srcm != null); + }); + CreateMap().ReverseMap().ForAllMembers(opt => + { + opt.UseDestinationValue(); + opt.Condition((src, dest, srcm, destm) => srcm != null); + }); + CreateMap().ReverseMap().ForAllMembers(opt => + { + opt.UseDestinationValue(); + opt.Condition((src, dest, srcm, destm) => srcm != null); + }); + CreateMap().ReverseMap().ForAllMembers(opt => + { + opt.UseDestinationValue(); + opt.Condition((src, dest, srcm, destm) => srcm != null); + }); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + + CreateMap(); CreateMap(); diff --git a/Elight.Entity/Elight.Entity.csproj b/Elight.Entity/Elight.Entity.csproj index a028bc6..5cc6a0b 100644 --- a/Elight.Entity/Elight.Entity.csproj +++ b/Elight.Entity/Elight.Entity.csproj @@ -4,6 +4,7 @@ net6.0 enable enable + True diff --git a/Elight.Logic/Elight.Logic.csproj b/Elight.Logic/Elight.Logic.csproj index 9643df3..c42dd72 100644 --- a/Elight.Logic/Elight.Logic.csproj +++ b/Elight.Logic/Elight.Logic.csproj @@ -4,6 +4,7 @@ net6.0 enable enable + True diff --git a/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs b/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs new file mode 100644 index 0000000..4c4cbd1 --- /dev/null +++ b/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs @@ -0,0 +1,55 @@ +using Elight.Utility.Code; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Logic.Model.Lawyer +{ + public class LawyerArchivesInput:Paging + { + /// + /// 阅卷Id + /// + [DataMember] + public string? Id { get; set; } + /// + /// 预约Id + /// + [DataMember] + public string? lawyerservicesId { get; set; } + /// + /// 部门受案号 + /// + [DataMember] + public string? bmsah { get; set; } + /// + /// 律师Id + /// + [DataMember] + public string? lawyerId { get; set; } + /// + /// 单位Id + /// + [DataMember] + public string? unitCode { get; set; } + /// + /// 预约类型 + /// + [DataMember] + public string? reservationId { get; set; } + /// + /// 接待人Id + /// + [DataMember] + public string? receptionuserId { get; set; } + /// + /// 0:待办理，1：同意 ，2：拒绝 预约申请状态 + /// + [DataMember] + public int? state { get; set; } + } +} diff --git a/Elight.Utility/Elight.Utility.csproj b/Elight.Utility/Elight.Utility.csproj index afd13e6..31c2483 100644 --- a/Elight.Utility/Elight.Utility.csproj +++ b/Elight.Utility/Elight.Utility.csproj @@ -13,6 +13,7 @@ + diff --git a/Elight.Utility/Extensions/ConvertorHelper.cs b/Elight.Utility/Extensions/ConvertorHelper.cs new file mode 100644 index 0000000..8bb0c5a --- /dev/null +++ b/Elight.Utility/Extensions/ConvertorHelper.cs @@ -0,0 +1,145 @@ +using Newtonsoft.Json; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System; +using System.Text.RegularExpressions; + +namespace Elight.Utility.Extensions +{ + public static class ConvertorHelper + { + /// + /// model=>json string + /// + /// + /// + /// + + private readonly static JsonSerializerSettings settings = new JsonSerializerSettings() + { + NullValueHandling = NullValueHandling.Ignore, + ReferenceLoopHandling = ReferenceLoopHandling.Ignore + }; + public static string ConvertToJsonStr(this T t) + { + try + { + return JsonConvert.SerializeObject(t, Formatting.None, settings); + + } + catch + { + return default; + } + } + public static T DeepCopy(this T t) + { + return t.ConvertToJsonStr().ConvertToModel(); + } + /// + /// json转为匿名对象 + /// + /// + /// + /// + /// + public static T ConvertToAnonymousType(this object json, T anonymousTypeObject) + { + try + { + return JsonConvert.DeserializeAnonymousType(json.ToString(), anonymousTypeObject); + } + catch + { + return default; + } + } + /// + /// object 转匿名类 + /// + /// + /// + /// + /// + public static T ConvertToAnonymous(this object anonymous, T anonymousType) + { + try + { + if (anonymous != null) + { + return (T)anonymous; + } + else + { + return default; + } + } + catch + { + return default; + + } + } + /// + /// json string=>mdoel + /// + /// + /// + /// + public static T ConvertToModel(this string str, [CallerMemberName] string methodname = "") + { + try + { + return JsonConvert.DeserializeObject(str); + } + catch (Exception) + { + return default; + } + } + public static string ConvertToBase64(this string str) + { + return Convert.ToBase64String(Encoding.Default.GetBytes(str)); + } + public static string ConvertToGetParam(this object obj) + { + StringBuilder strBui = new StringBuilder(); + + System.Reflection.PropertyInfo[] proArray = obj.GetType().GetProperties(); + foreach (System.Reflection.PropertyInfo pro in proArray) + { + if (strBui.Length < 1) + { + strBui.Append("?"); + } + else + { + strBui.Append("&"); + } + strBui.Append(string.Format("{0}={1}", pro.Name, pro.GetValue(obj, null))); + } + return strBui.ToString(); + } + // DateTime --> long + public static long ConvertDateTimeToLong(DateTime dt) + { + DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); + TimeSpan toNow = dt.Subtract(dtStart); + long timeStamp = toNow.Ticks; + timeStamp = long.Parse(timeStamp.ToString().Substring(0, timeStamp.ToString().Length - 4)); + return timeStamp; + } + // long --> DateTime + public static DateTime ConvertLongToDateTime(long d) + { + DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); + long lTime = long.Parse(d + "0000"); + TimeSpan toNow = new TimeSpan(lTime); + DateTime dtResult = dtStart.Add(toNow); + return dtResult; + } + + } +} diff --git a/Elight.Utility/Result.cs b/Elight.Utility/Result.cs index 95de0cc..7a00c2f 100644 --- a/Elight.Utility/Result.cs +++ b/Elight.Utility/Result.cs @@ -23,19 +23,19 @@ namespace Elight.Utility.Code /// [DataMember] public string Message { get; set; } - /// - /// 消息 - /// - [DataMember] - public dynamic result { get; set; } - } + /// + /// 消息 + /// + [DataMember] + public dynamic result { get; set; } + } /// /// 消息 /// [Serializable] [DataContract] - public class ResultData:Result + public class ResultData : Result { /// /// 数据 @@ -56,6 +56,6 @@ namespace Elight.Utility.Code /// 扩展数据 /// [DataMember] - public T Data { get; set; } + public new T result { get; set; } } }