预约查询接口添加返回字段，律师服务数据添加附件字段，律师用户注册新增审核功能及审核接口，登录接口判断账号是否可用

24Hour/Controllers/Common/CommonController.cs

@@ -360,6 +360,7 @@ namespace _24Hour.Controllers.Common
                         Id = q.Id,
                         daId = da?.Id,
                         Unitname = Unitdata?.unitname,
+                        unitCode = Unitdata?.unitCode,
                         title = da?.title,
                         color = da?.color,
                         icon = da?.icon,
@@ -383,7 +384,8 @@ namespace _24Hour.Controllers.Common
                         receptionuser = q.receptionuser,
                         receive = q.createuserId,
                         username = userda?.name,
-                        notes = q.notes
+                        notes = q.notes,
+                        annex = q.annex
                     });
                 });
                 //获取远程会见预约记录
@@ -402,6 +404,7 @@ namespace _24Hour.Controllers.Common
                         title = da?.title,
                         color = da?.color,
                         icon = da?.icon,
+                        unitCode = Unitdata?.unitCode,
                         Unitname = Unitdata?.unitname,
                         name = q.name,
                         phone = q.phone,
@@ -425,7 +428,8 @@ namespace _24Hour.Controllers.Common
                         username = q.meetwitname,
                         receive = q.createuserId,
                         notes = q.notes,
-                        appurl = q.appurl
+                        appurl = q.appurl,
+                        annex = ""
                     });
                 });
                 //获取远程接待预约记录
@@ -445,6 +449,7 @@ namespace _24Hour.Controllers.Common
                         color = da?.color,
                         icon = da?.icon,
                         Unitname = Unitdata?.unitname,
+                        unitCode = Unitdata?.unitCode,
                         name = "",
                         phone = q.phone,
                         matter = q.matter,//事由
@@ -467,7 +472,8 @@ namespace _24Hour.Controllers.Common
                         username = q.meetwitname,
                         receive = q.createuserId,
                         notes = q.notes,
-                        appurl = ""
+                        appurl = "",
+                        annex = ""
                     });
                 });
                 //获取认罪认罚预约记录
@@ -487,6 +493,7 @@ namespace _24Hour.Controllers.Common
                         color = da?.color,
                         icon = da?.icon,
                         Unitname = Unitdata?.unitname,
+                        unitCode = Unitdata?.unitCode,
                         name = "",
                         phone = q.phone,
                         matter = q.matter,//事由
@@ -509,7 +516,8 @@ namespace _24Hour.Controllers.Common
                         username = q.meetwitname,
                         receive = q.createuserId,
                         notes = q.notes,
-                        appurl = ""
+                        appurl = "",
+                        annex = ""
                     });
                 });
                 //获取听证预约记录
@@ -530,6 +538,7 @@ namespace _24Hour.Controllers.Common
                         color = da?.color,
                         icon = da?.icon,
                         Unitname = Unitdata?.unitname,
+                        unitCode = Unitdata?.unitCode,
                         name = q.lawyeruser,//律师律师名称
 
                         lawyerunit = q.lawyerunit,//律师事务所
@@ -550,7 +559,8 @@ namespace _24Hour.Controllers.Common
                         username = userda?.name,//办理人名称
                         receive = q.createuserId,//办接收人
                         notes = q.notes,
-                        appurl = ""
+                        appurl = "",
+                        annex = ""
                     });
                 });
                 //分页查询--如有预约类型--reservationId可筛选预约类型,预约信息Id--可筛选预约信息

24Hour/Controllers/Common/WebSocketController.cs

@@ -521,14 +521,6 @@ namespace _24Hour.Controllers.Common
                     #region 消息处理（消息转发）
                     try
                     {
-                        #region 关闭Socket处理，删除连接池
-                        if (socket.State != WebSocketState.Open)//连接关闭
-                        {
-                            if (CONNECT_POOL.ContainsKey(_userdata.Id)) CONNECT_POOL.Remove(_userdata.Id);//删除连接池
-                            return true;
-                        }
-                        #endregion
-
                         #region 消息发送
                         var content = "system";
                         buffer = new ArraySegment<byte>(Encoding.UTF8.GetBytes(content));
@@ -548,8 +540,6 @@ namespace _24Hour.Controllers.Common
             }
             catch (Exception)
             {
-                //整体异常处理
-                if (CONNECT_POOL.ContainsKey(_userdata.Id)) CONNECT_POOL.Remove(_userdata.Id);
             }
             return true;
         }

24Hour/Controllers/LoginController.cs

@@ -49,7 +49,7 @@ namespace _24Hour.Controllers
         public async Task<Result> LoginDefault()
         {
             var Passmd5 = Md5.Encrypt32("jcy@123456").ToLower();
-            var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== "admin"  && x.IsDeleted==0).FirstAsync();
+            var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == "admin" && x.IsDeleted == 0).FirstAsync();
             if (date == null)
             {
                 ret.IsSucceed = false;
@@ -64,10 +64,10 @@ namespace _24Hour.Controllers
             }
             if (!string.IsNullOrEmpty(date.department))
             {
-                var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id== date.department  && x.IsDelete==0).FirstAsync();
+                var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id == date.department && x.IsDelete == 0).FirstAsync();
-                if (dept!= null)
+                if (dept != null)
                 {
-                    date.departmentName= dept.departname;
+                    date.departmentName = dept.departname;
                 }
             }
             #region jwt生成token
@@ -90,7 +90,7 @@ namespace _24Hour.Controllers
             );
             //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
             var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
-            ret.IsSucceed=true;
+            ret.IsSucceed = true;
             ret.result = new
             {
                 Id = date.Id,
@@ -106,7 +106,7 @@ namespace _24Hour.Controllers
                 token = tokenString
             };
             #endregion
-            ret.IsSucceed=true;
+            ret.IsSucceed = true;
             return ret;
         }
 
@@ -124,7 +124,7 @@ namespace _24Hour.Controllers
             try
             {
                 var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
-                var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone  && x.IsDeleted==0).FirstAsync();
+                var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == login.phone && x.IsDeleted == 0).FirstAsync();
                 if (date == null)
                 {
                     ret.IsSucceed = false;
@@ -139,10 +139,10 @@ namespace _24Hour.Controllers
                 }
                 if (!string.IsNullOrEmpty(date.department))
                 {
-                    var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id== date.department  && x.IsDelete==0).FirstAsync();
+                    var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id == date.department && x.IsDelete == 0).FirstAsync();
-                    if (dept!= null)
+                    if (dept != null)
                     {
-                        date.departmentName= dept.departname;
+                        date.departmentName = dept.departname;
                     }
                 }
 
@@ -166,7 +166,7 @@ namespace _24Hour.Controllers
                 );
                 //var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
                 var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
-                ret.IsSucceed=true;
+                ret.IsSucceed = true;
                 ret.result = new
                 {
                     Id = date.Id,
@@ -205,13 +205,25 @@ namespace _24Hour.Controllers
             try
             {
                 var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
-                var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone  && x.IsDeleted==0).FirstAsync();
+                var date = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone == login.phone && x.IsDeleted == 0).FirstAsync();
                 if (date == null)
                 {
                     ret.IsSucceed = false;
                     ret.Message = "账号不存在，请先注册！";
                     return ret;
                 }
+                if (date.identity == "律师" && date.audit == 1)
+                {
+                    ret.IsSucceed = false;
+                    ret.Message = $"用户信息审核未通过，原因：{date.describe}，请重新注册！";
+                    return ret;
+                }
+                else if (date.identity == "律师" && date.audit == 2)
+                {
+                    ret.IsSucceed = false;
+                    ret.Message = "用户信息审核中！";
+                    return ret;
+                }
                 if (Passmd5 != date.Password)
                 {
                     ret.IsSucceed = false;
@@ -238,10 +250,10 @@ namespace _24Hour.Controllers
                 }
                 if (!string.IsNullOrEmpty(date.department))
                 {
-                    var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id== date.department  && x.IsDelete==0).FirstAsync();
+                    var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id == date.department && x.IsDelete == 0).FirstAsync();
-                    if (dept!= null)
+                    if (dept != null)
                     {
-                        date.departmentName= dept.departname;
+                        date.departmentName = dept.departname;
                     }
                 }
                 #region jwt生成token
@@ -378,24 +390,71 @@ namespace _24Hour.Controllers
             try
             {
                 var data = await _db.Queryable<App_Sys_UserModel>().Where(q => q.phone == UserModel.phone).FirstAsync();
-                if (data != null)
+                if (UserModel.identity == "律师")
                 {
-                    ret.IsSucceed = false;
+                    if (data != null && (data.identity != "律师" || data.audit == 0))
-                    ret.Message = "电话号码已存在！";
+                    {
-                    return ret;
+                        ret.IsSucceed = false;
-                }
+                        ret.Message = "电话号码已存在！";
-                _db.BeginTran();
+                        return ret;
-                UserModel.Id = Guid.NewGuid().ToString();
+                    }
-                UserModel.usertype = 1;
+                    else if (data != null && data.audit == 2)
-                //默认密码
+                    {
-                UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower();
+                        ret.IsSucceed = false;
+                        ret.Message = "账号审核中！";
+                        return ret;
+                    }
 
-                var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
+                    if (data != null && data.audit == 1)
-                _db.CommitTran();
+                    {
-                if (num > 0)
+                        _db.BeginTran();
-                {
+                        data.audit = 2;
-                    ret.IsSucceed = true;
+                        var num = await _db.Updateable(data).ExecuteCommandAsync();
-                    ret.result = "添加成功";
+                        _db.CommitTran();
+                        if (num > 0)
+                        {
+                            ret.IsSucceed = true;
+                            ret.result = "添加成功,审核中！";
+                        }
+                    }
+                    else
+                    {
+                        _db.BeginTran();
+                        UserModel.Id = Guid.NewGuid().ToString();
+                        UserModel.usertype = 1;
+                        UserModel.audit = 2;
+                        //默认密码
+                        UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower();
+                        var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
+                        _db.CommitTran();
+                        if (num > 0)
+                        {
+                            ret.IsSucceed = true;
+                            ret.result = "添加成功";
+                        }
+                    }
+                }
+                else
+                {
+                    if (data != null)
+                    {
+                        ret.IsSucceed = false;
+                        ret.Message = "电话号码已存在！";
+                        return ret;
+                    }
+                    _db.BeginTran();
+                    UserModel.Id = Guid.NewGuid().ToString();
+                    UserModel.usertype = 1;
+                    //默认密码
+                    UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower();
+
+                    var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
+                    _db.CommitTran();
+                    if (num > 0)
+                    {
+                        ret.IsSucceed = true;
+                        ret.result = "添加成功";
+                    }
                 }
             }
             catch (System.Exception ex)

24Hour/Controllers/system/SystemControllerController.cs

@@ -127,12 +127,16 @@ namespace _24Hour.Controllers.system
         [Route("QueryUser1")]
         public async Task<Result> QueryUser1(App_Sys_UserInput UserModel)
         {
+            RefAsync<int> totalNumber = 0;//总数据
             var list = await _db.Queryable<App_Sys_UserModel>()
                 .WhereIF(!UserModel.name.IsNull(), q => q.name.Contains(UserModel.name))
+                .WhereIF(!UserModel.identity.IsNull(), q => q.identity.Contains(UserModel.identity))
                 .WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone))
                 .WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties))
                 .WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId))
-                .Where(q => q.IsDeleted == 0 && q.usertype == 1).ToPageListAsync(UserModel.PageIndex, UserModel.PageSize);
+                .WhereIF(UserModel.audit!=null, q => q.audit==UserModel.audit)
+                .Where(q => q.IsDeleted == 0 && q.usertype == 1).ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber);
+            UserModel.RowsCount = totalNumber;
             var data = new QueryResult<App_Sys_UserModel>(UserModel, list);
             result.IsSucceed = true;
             result.result = data;
@@ -451,6 +455,82 @@ namespace _24Hour.Controllers.system
             }
             _logs.WriteSysLogadd("用户管理", "重置密码", result, _db);
             return result;
+        }
+
+        /// <summary>
+        /// 修改头像
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("Sculpture")]
+        public async Task<Result> Sculpture(string photo)
+        {
+            try
+            {
+                _db.BeginTran();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync();
+                userlist.ForEach(q =>
+                {
+                    //头像地址
+                    q.photo = photo;
+                });
+                var num = await _db.Updateable(userlist).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;
+        }
+
+        /// <summary>
+        /// app--认证接口
+        /// </summary>
+        /// <param name="Id">用户Id</param>
+        /// <param name="status">审核状态：0：通过，1：不通过</param>
+        /// <param name="describe">审核描述</param>
+        /// <returns>律师信息审核认证</returns>
+        [HttpGet]
+        [Route("Examine")]
+        public async Task<Result> Examine(string Id, int status,string describe)
+        {
+            try
+            {
+                _db.BeginTran();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync();
+                userlist.ForEach(q =>
+                {
+                    q.audit = status;
+                    q.describe = describe;
+                });
+                var num = await _db.Updateable(userlist).ExecuteCommandAsync();
+                _db.CommitTran();
+                if (num > 0)
+                {
+                    result.IsSucceed = true;
+                    result.result = status==0?"认证通过":"认证不通过";
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _db.RollbackTran();
+                result.IsSucceed = false;
+                result.Message = ex.Message;
+                LogService.WriteLog(ex, "用户头像替换");
+            }
+            _logs.WriteSysLogadd("用户管理", "用户头像替换", result, _db);
+            return result;
         }
         #endregion
 

Elight.Entity/AppMode/App_LawyerServicesModel.cs

@@ -129,5 +129,11 @@ namespace Elight.Entity
         /// </summary>
         [DataMember]
         public int? IsDeleted { get; set; } = 0;
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [DataMember]
+        public string annex { get; set; }
     }
 }

Elight.Logic/SystemModel/App_Sys_UserInput.cs

@@ -89,6 +89,12 @@ namespace Elight.Logic.SystemModel
         [DataMember]
         public int? becurrent { get; set; }
 
+        /// <summary>
+        /// 审核状态：0：通过，1：不通过，2：待审核
+        /// </summary>
+        [DataMember]
+        public int? audit { get; set; }
+
         /// <summary>
         /// 头像地址
         /// </summary>