Merge branch 'develop' of http://192.168.0.12:3000/Coder/24Hour.Service into develop

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -358,21 +358,35 @@ namespace _24Hour.Controllers.Common
         /// <remarks>数据的返回格式已确定，内容时真实数据经过修改的</remarks>
         [HttpGet]
         [Route("QueryFileFromtwenty")]
-        public Task<Result<JZJBXXDto>> QueryFileFromtwenty(string bmsah)
+        public Task<Result> QueryFileFromtwenty(string bmsah)
         {
-            Result<JZJBXXDto> res = new Result<JZJBXXDto>();
             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()
         {
@@ -391,6 +405,17 @@ namespace _24Hour.Controllers.Common
             return convert;
         }
         /// <summary>
+        /// 上传已选中的第三级页码的id
+        /// </summary>
+        /// <param name="bmsah"></param>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpPost("AddArchivesInfoByChildId")]
+        public Task<Result> AddArchivesInfoByChildId(AddArchivesInfoInput input)
+        {
+            return Task.FromResult(result);
+        }
+        /// <summary>
         /// 添加卷宗信息
         /// </summary>
         /// <param name="dto"></param>
@@ -405,7 +430,6 @@ namespace _24Hour.Controllers.Common
             Result<JZJBXXDto> res = new Result<JZJBXXDto>();
             try
             {
-
                 var data = mapper.Map<JZJBXX>(dto);
 
                 var mls = dto.jzml.ToList();
@@ -422,7 +446,7 @@ namespace _24Hour.Controllers.Common
                 res.result = dto;
                 return res;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 result.IsSucceed = false;
                 return res;
@@ -431,4 +455,4 @@ namespace _24Hour.Controllers.Common
 
         #endregion
     }
-}
+}

24Hour/Controllers/Common/LawyerservicesController.cs

@@ -82,11 +82,11 @@ namespace _24Hour.Controllers.Common
             RefAsync<int> totalNumber = 0;//总数据
             //查询律师服务
             var list = await _db.Queryable<App_LawyerServicesModel>()
-                .WhereIF(Lawyerdata.name != null, q => q.name.Contains(Lawyerdata.name))
+                .WhereIF(Lawyerdata?.name != null, q => q.name.Contains(Lawyerdata.name))
-                .WhereIF(Lawyerdata.objectstr != null, q => q.objectstr.Contains(Lawyerdata.objectstr))
+                .WhereIF(Lawyerdata?.objectstr != null, q => q.objectstr.Contains(Lawyerdata.objectstr))
-                .WhereIF(Lawyerdata.unitId != null, q => q.unitCode.Contains(Lawyerdata.unitId))
+                .WhereIF(Lawyerdata?.unitId != null, q => q.unitCode.Contains(Lawyerdata.unitId))
-                .WhereIF(Lawyerdata.state != null, q => q.state == Lawyerdata.state)
+                .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?.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<App_LawyerServicesModel>(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList());
@@ -254,19 +254,23 @@ namespace _24Hour.Controllers.Common
         /// <returns></returns>
         [HttpGet]
         [Route("UpdateLawyerstate")]
-        public async Task<Result> UpdateLawyerstate(string? Id, int state, string? reason)
+        public async Task<Result> UpdateLawyerstate(string? Id, int state, string? reason,DateTime starttime,DateTime endtime)
         {
             try
             {
                 var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().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)
                     {

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": {

Elight.Entity/APPDto/Lawyer/JZMLDto.cs

@@ -61,7 +61,7 @@ namespace Elight.Entity.APPDto.Lawyer
         /// </summary>
         public string? dwbm { get; set; }
 
-        public List<JZWJItemDto>? jzwj { get; set; }
+        public List<JZWJItemDto> jzwj { get; set; }
     }
 
 

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
+    {
+        /// <summary>
+        /// 部门受案号
+        /// </summary>
+        public string Bmsah { get; set; }
+        /// <summary>
+        /// 预约记录Id
+        /// </summary>
+        public string ServiceId { get; set; }
+        /// <summary>
+        /// 被选中的三级id
+        /// </summary>
+        public List<string> Ids { get; set; }
+    }
+}