From 940bb24d74a708be7da5a540194f5fc0acbb7716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 17:45:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/LawyerservicesController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index 61af5ec..f1a2126 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -82,11 +82,11 @@ namespace _24Hour.Controllers.Common RefAsync totalNumber = 0;//总数据 //查询律师服务 var list = await _db.Queryable() - .WhereIF(Lawyerdata.name != null, q => q.name.Contains(Lawyerdata.name)) - .WhereIF(Lawyerdata.objectstr != null, q => q.objectstr.Contains(Lawyerdata.objectstr)) - .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)) + .WhereIF(Lawyerdata?.name != null, q => q.name.Contains(Lawyerdata.name)) + .WhereIF(Lawyerdata?.objectstr != null, q => q.objectstr.Contains(Lawyerdata.objectstr)) + .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); Lawyerdata.RowsCount = totalNumber; var data = new QueryResult(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList()); From 7b2eb1232ccbcce44a96e168b0a94cadad85f4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 17:46:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9Emodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Model/Lawyer/AddArchivesInfoInput.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs diff --git a/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs b/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs new file mode 100644 index 0000000..02775e0 --- /dev/null +++ b/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Logic.Model.Lawyer +{ + public class AddArchivesInfoInput + { + /// + /// 部门受案号 + /// + public string Bmsah { get; set; } + /// + /// 预约记录Id + /// + public string ServiceId { get; set; } + /// + /// 被选中的三级id + /// + public List Ids { get; set; } + } +} From a02bcc122752e9cd9c0bafd5a321ef54ffd9ba73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 17:46:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E7=A9=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Logic/Model/App_LawyerServicesInput.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Elight.Logic/Model/App_LawyerServicesInput.cs b/Elight.Logic/Model/App_LawyerServicesInput.cs index ebaea99..1b1aa1d 100644 --- a/Elight.Logic/Model/App_LawyerServicesInput.cs +++ b/Elight.Logic/Model/App_LawyerServicesInput.cs @@ -81,6 +81,6 @@ namespace Elight.Logic /// 0:待办理，1：同意 ，2：拒绝 /// [DataMember] - public int state { get; set; } + public int? state { get; set; } } } From ade3f5a05f9e3bc05a05bfc835f46499c1a78793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 17:47:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?jzwj=E8=AE=BE=E4=B8=BA=E5=8F=AF=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Entity/APPDto/Lawyer/JZMLDto.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Elight.Entity/APPDto/Lawyer/JZMLDto.cs b/Elight.Entity/APPDto/Lawyer/JZMLDto.cs index e313334..5e71099 100644 --- a/Elight.Entity/APPDto/Lawyer/JZMLDto.cs +++ b/Elight.Entity/APPDto/Lawyer/JZMLDto.cs @@ -61,7 +61,7 @@ namespace Elight.Entity.APPDto.Lawyer /// public string? dwbm { get; set; } - public List? jzwj { get; set; } + public List jzwj { get; set; } } From fbe4c37afe9876058dd8000023495c5dad86fd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 17:47:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=AF=E5=90=8C=E6=AD=A5=E5=90=8C=E6=84=8F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/LawyerservicesController.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index f1a2126..e0ad768 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -254,19 +254,23 @@ 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,DateTime starttime,DateTime endtime) { try { var Lawyerbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync(); if (Lawyerbol.Any()) { + Lawyerbol.FirstOrDefault().receptiontime=starttime; + Lawyerbol.FirstOrDefault().receptionEndtime=endtime; + Lawyerbol.FirstOrDefault().state = state; 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 ,it.receptiontime,it + .receptionEndtime}).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { From 13f6be3b83688ad85f5d3005a632479025a0e1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 17:48:24 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8D=B7=E5=AE=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3AddArchivesInfoByChildId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 44 ++++++++++++++----- 24Hour/appsettings.json | 2 +- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 7539aba..587109a 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -356,21 +356,35 @@ namespace _24Hour.Controllers.Common /// [HttpGet] [Route("QueryFileFromtwenty")] - public Task> QueryFileFromtwenty(string bmsah) + public Task QueryFileFromtwenty(string bmsah) { - Result res = new Result(); if (bmsah == "安北检刑诉受[2023]433333333333号") { - - res.IsSucceed = true; var a = GetInfo(); - res.result = a; + var data = new + { + id = a.jzbh, + lable = a.jzmc, + children = a?.jzml?.Select(x => new + { + id = x.mlbh, + lable = x.mlxsmc, + children = x.jzwj.Select(q => new + { + id = q.wjxh, + lable = q.wjxsmc, + filepath = q.jpgwjlj + }) + }) + }; + result.IsSucceed = true; + result.result = data; } else { - res.IsSucceed = false; + result.IsSucceed = false; } - return Task.FromResult(res); + return Task.FromResult(result); } private JZJBXXDto GetInfo() { @@ -389,6 +403,17 @@ namespace _24Hour.Controllers.Common return convert; } /// + /// 上传已选中的第三级页码的id + /// + /// + /// + /// + [HttpPost("AddArchivesInfoByChildId")] + public Task AddArchivesInfoByChildId(AddArchivesInfoInput input) + { + return Task.FromResult(result); + } + /// /// 添加卷宗信息 /// /// @@ -400,7 +425,6 @@ namespace _24Hour.Controllers.Common Result res = new Result(); try { - var data = mapper.Map(dto); var mls = dto.jzml.ToList(); @@ -417,7 +441,7 @@ namespace _24Hour.Controllers.Common res.result = dto; return res; } - catch(Exception ex) + catch (Exception ex) { result.IsSucceed = false; return res; @@ -426,4 +450,4 @@ namespace _24Hour.Controllers.Common #endregion } -} \ No newline at end of file +} diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index 010af95..120c84b 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "ConnectionStrings": { "DBType": "MySQL", - "MySQLConnString": "server=192.168.0.251;Database=equipmentrearend;Uid=root;Pwd=sa@admin;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;" + "MySQLConnString": "server=127.0.0.1;Database=equipmentrearend;Uid=root;Pwd=insght;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;" }, //JwtConfig "JwtConfiguration": {