linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

分配任务添加审核状态、原因、确定日期

master
林杨 2 years ago
parent
47f272d0df
commit
4657ddddad
5 changed files with 222 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      24Hour/Controllers/Common/CommonController.cs
  2. 5
      24Hour/Controllers/Common/LawyerservicesController.cs
  3. 252
      24Hour/Controllers/LoginController.cs
  4. 1
      24Hour/Controllers/system/SystemControllerController.cs
  5. 40
      Elight.Entity/SystemModel/UpdateuserDto.cs

85
24Hour/Controllers/Common/CommonController.cs
Unescape View File

@ -1,4 +1,5 @@
using Elight.Entity;
using Elight.Entity.SystemModel;
using Elight.Logic;
using Elight.Utility;
using Elight.Utility.Code;
@ -1117,32 +1118,73 @@ namespace _24Hour.Controllers.Common
/// <returns></returns>
[HttpGet]
[Route("Updateuser")]
public async Task<Result> Updateuser(string? Id, string? userId, string? username)
public async Task<Result> Updateuser(UpdateuserDto dto)
{
try
{
if (dto== null)
{
result.IsSucceed = false;
result.result = "接受参数失败";
return result;
}
if (string.IsNullOrEmpty(dto.Id))
{
result.IsSucceed = false;
result.result = "编号不能为空";
return result;
}
if (string.IsNullOrEmpty(dto.userId))
{
result.IsSucceed = false;
result.result = "用户编号不能为空";
return result;
}
if (dto.time== null)
{
result.IsSucceed = false;
result.result = "确认时间不能为空";
return result;
}
if (dto.state==false && string.IsNullOrEmpty(dto.reason))
{
result.IsSucceed = false;
result.result = "拒绝原因不能为空";
return result;
}
//律师服务
var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q => q.Id == Id).ToListAsync();
var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q => q.Id == dto.Id).ToListAsync();
if (Lawyerbol.Count() > 0)
{
Lawyerbol.FirstOrDefault().receptionuser = userId;
Lawyerbol.FirstOrDefault().receptionusername = username;
Lawyerbol.FirstOrDefault().receptionuser =dto.userId;
Lawyerbol.FirstOrDefault().receptionusername = dto.username;
Lawyerbol.FirstOrDefault().acceptancetime =dto.time;
Lawyerbol.FirstOrDefault().reason =dto.reason;
Lawyerbol.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran();
var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
_SocketCon.system(userId);
_SocketCon.system(dto.userId);
result.IsSucceed = true;
result.result = "修改成功";
}
}
//远程会见
var RemoteModelbol = await _db.Queryable<App_RemoteModel>().Where(q => q.Id == Id).ToListAsync();
var RemoteModelbol = await _db.Queryable<App_RemoteModel>().Where(q => q.Id == dto.Id).ToListAsync();
if (RemoteModelbol.Count() > 0)
{
RemoteModelbol.FirstOrDefault().meetwitId = userId;
RemoteModelbol.FirstOrDefault().meetwitname = username;
RemoteModelbol.FirstOrDefault().meetwitId = dto.userId;
RemoteModelbol.FirstOrDefault().meetwitname =dto.username;
RemoteModelbol.FirstOrDefault().acceptancetime =dto.time;
RemoteModelbol.FirstOrDefault().reason =dto.reason;
RemoteModelbol.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran();
var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
_db.CommitTran();
@ -1154,11 +1196,14 @@ namespace _24Hour.Controllers.Common
}
//获取远程接待预约记录
var Receptiondata = await _db.Queryable<App_ReceptionModel>()
.Where(q => q.Id== Id).ToArrayAsync();
.Where(q => q.Id== dto.Id).ToArrayAsync();
if (Receptiondata.Count() > 0)
{
Receptiondata.FirstOrDefault().meetwitId = userId;
Receptiondata.FirstOrDefault().meetwitname = username;
Receptiondata.FirstOrDefault().meetwitId = dto.userId;
Receptiondata.FirstOrDefault().meetwitname =dto.username;
Receptiondata.FirstOrDefault().acceptancetime =dto.time;
Receptiondata.FirstOrDefault().reason =dto.reason;
Receptiondata.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran();
var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
_db.CommitTran();
@ -1170,11 +1215,14 @@ namespace _24Hour.Controllers.Common
}
//获取认罪认罚预约记录
var Confessiondata = await _db.Queryable<App_ConfessionModel>()
.Where(q => q.Id == Id).ToArrayAsync();
.Where(q => q.Id == dto.Id).ToArrayAsync();
if (Confessiondata.Count() > 0)
{
Confessiondata.FirstOrDefault().meetwitId = userId;
Confessiondata.FirstOrDefault().meetwitname = username;
Confessiondata.FirstOrDefault().meetwitId = dto.userId;
Confessiondata.FirstOrDefault().meetwitname = dto.username;
Confessiondata.FirstOrDefault().acceptancetime =dto.time;
Confessiondata.FirstOrDefault().reason =dto.reason;
Confessiondata.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran();
var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
_db.CommitTran();
@ -1186,11 +1234,14 @@ namespace _24Hour.Controllers.Common
}
//获取听证预约记录
var Hearingdata = await _db.Queryable<App_HearingModel>()
.Where(q => q.Id == Id).ToArrayAsync();
.Where(q => q.Id == dto.Id).ToArrayAsync();
if (Hearingdata.Count() > 0)
{
Hearingdata.FirstOrDefault().receptionuser = userId;
Hearingdata.FirstOrDefault().receptionusername = username;
Hearingdata.FirstOrDefault().receptionuser = dto.userId;
Hearingdata.FirstOrDefault().receptionusername = dto.username;
Hearingdata.FirstOrDefault().acceptancetime =dto.time;
Hearingdata.FirstOrDefault().reason =dto.reason;
Hearingdata.FirstOrDefault().state =dto.state==true ? 1 : 2;
_db.BeginTran();
var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername }).ExecuteCommandAsync();
_db.CommitTran();

5
24Hour/Controllers/Common/LawyerservicesController.cs
Unescape View File

@ -7,6 +7,7 @@ using Elight.Utility.logs;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Net.WebSockets;
using static java.security.cert.CertPathValidatorException;
namespace _24Hour.Controllers.Common
@ -18,7 +19,8 @@ namespace _24Hour.Controllers.Common
[ApiController]
[Route("api/Lawyer")]
public class LawyerservicesController : Controller
{
{
private static Dictionary<string, WebSocket> CONNECT_POOL = new Dictionary<string, WebSocket>();//用户连接池
#region Identity
private readonly SqlSugarClient _db;//数据库
private readonly WriteSysLog _logs;//操作日志
@ -107,6 +109,7 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = true;
result.result = "添加成功";
}
}
catch (System.Exception ex)
{

252
24Hour/Controllers/LoginController.cs
Unescape View File

@ -1,4 +1,5 @@
using _24Hour.Model;
using com.sun.org.apache.bcel.@internal.generic;
using com.sun.xml.@internal.ws.api.model;
using Elight.Entity;
using Elight.Logic;
@ -54,81 +55,55 @@ namespace _24Hour.Controllers
try
{
var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync();
if (model == null)
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;
}
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0&&q.usertype==0 && q.isdeactivate == 0 && q.phone == login.phone&&q.Password== Passmd5).FirstAsync();
if (date != null)
{
if (Passmd5 != date.Password)
{
ret.IsSucceed = false;
ret.Message = "账号或者密码错误！";
return ret;
}
//else if (date.usertype == 1 && date.audit == null)
//{
// ret.IsSucceed = false;
// ret.Message = "账号审核中！";
// return ret;
//}
//else if (date.usertype == 1 && date.audit == 1)
//{
// ret.IsSucceed = false;
// ret.Message = $"账号审核未通过，原因：{date.describe}！";
// return ret;
//}
//else if (date.usertype == 0 && date.becurrent == 0)
//{
// ret.IsSucceed = false;
// ret.Message = $"账号无法登录，请联系管理员！";
// return ret;
//}
#region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[]
{
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
};
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//Token
var jwttoken = new JwtSecurityToken(
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
claims: claims,
notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(1),
signingCredentials: signingCredentials
);
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
ret.result = new
{
Id = date.Id,
name = date.name,
sex = date.sex,
phone = date.phone,
photo = date.photo,
duties = date.duties,
identity = date.identity,
unitCode = date.unitCode,
department = date.department,
token = tokenString
};
#endregion
ret.IsSucceed = true;
}
else
{
ret.IsSucceed = false;
ret.Message = "账号不存在！";
}
}
if (Passmd5 != date.Password)
{
ret.IsSucceed = false;
ret.Message = "账号或者密码错误！";
return ret;
}
#region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[]
{
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
};
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//Token
var jwttoken = new JwtSecurityToken(
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
claims: claims,
notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(1),
signingCredentials: signingCredentials
);
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
ret.IsSucceed=true;
ret.result = new
{
Id = date.Id,
name = date.name,
sex = date.sex,
phone = date.phone,
photo = date.photo,
duties = date.duties,
identity = date.identity,
unitCode = date.unitCode,
department = date.department,
token = tokenString
};
#endregion
}
catch (Exception ex)
{
@ -152,82 +127,73 @@ namespace _24Hour.Controllers
try
{
var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone && x.IsDeleted==0).FirstAsync();
if (model == null)
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;
}
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.phone == login.phone && q.Password == Passmd5).FirstAsync();
if (date != null)
{
if (Passmd5 != date.Password)
{
ret.IsSucceed = false;
ret.Message = "账号或密码错误！";
return ret;
}
//else if (date.usertype == 1 && date.audit == null)
//{
// ret.IsSucceed = false;
// ret.Message = "账号审核中！";
// return ret;
//}
//else if (date.usertype == 1 && date.audit == 1)
//{
// ret.IsSucceed = false;
// ret.Message = $"账号审核未通过，原因：{date.describe}！";
// return ret;
//}
else if (date.usertype == 0 && date.becurrent == 1)
{
ret.IsSucceed = false;
ret.Message = $"账号未授权无法登录，请联系管理员！";
return ret;
}
#region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[]
{
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
};
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//Token
var jwttoken = new JwtSecurityToken(
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
claims: claims,
notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(1),
signingCredentials: signingCredentials
);
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
ret.result = new
{
Id = date.Id,
name = date.name,
sex = date.sex,
phone = date.phone,
photo = date.photo,
duties = date.duties,
identity = date.identity,
usertype = date.usertype,
unitCode = date.unitCode,
department = "",
token = tokenString
};
#endregion
ret.IsSucceed = true;
}
else
{
ret.IsSucceed = false;
ret.Message = "账号或者密码错误！";
}
}
if (Passmd5 != date.Password)
{
ret.IsSucceed = false;
ret.Message = "账号或密码错误！";
return ret;
}
//else if (date.usertype == 1 && date.audit == null)
//{
// ret.IsSucceed = false;
// ret.Message = "账号审核中！";
// return ret;
//}
//else if (date.usertype == 1 && date.audit == 1)
//{
// ret.IsSucceed = false;
// ret.Message = $"账号审核未通过，原因：{date.describe}！";
// return ret;
//}
else if (date.usertype == 0 && date.becurrent == 1)
{
ret.IsSucceed = false;
ret.Message = $"账号未授权无法登录，请联系管理员！";
return ret;
}
#region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[]
{
new Claim(ClaimTypes.UserData,JsonConvert.SerializeObject(date)),
};
var key = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(_configuration.GetSection("JwtConfiguration:Jwtkey").Value));
var signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
//Token
var jwttoken = new JwtSecurityToken(
issuer: _configuration.GetSection("JwtConfiguration:Issuer").Value,
audience: _configuration.GetSection("JwtConfiguration:Audience").Value,
claims: claims,
notBefore: DateTime.Now,
expires: DateTime.Now.AddDays(1),
signingCredentials: signingCredentials
);
//var token = new JwtSecurityTokenHandler().CreateToken(jwttoken);
var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken);
ret.result = new
{
Id = date.Id,
name = date.name,
sex = date.sex,
phone = date.phone,
photo = date.photo,
duties = date.duties,
identity = date.identity,
usertype = date.usertype,
unitCode = date.unitCode,
department = "",
token = tokenString
};
#endregion
ret.IsSucceed = true;
}
catch (Exception ex)
{

1
24Hour/Controllers/system/SystemControllerController.cs
Unescape View File

@ -885,6 +885,7 @@ namespace _24Hour.Controllers.system
/// <returns></returns>
[HttpGet]
[Route("QueryDepart")]
[AllowAnonymous]
public async Task<Result> QueryDepart(string unitId)
{
var totalCount = 0;

40
Elight.Entity/SystemModel/UpdateuserDto.cs
Unescape View File

@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Elight.Entity.SystemModel
{
public class UpdateuserDto
{
/// <summary>
/// 数据编号
/// </summary>
public string? Id { get; set; }
/// <summary>
/// 用户编号
/// </summary>
public string? userId { get; set; }
/// <summary>
/// 用户名称
/// </summary>
public string? username { get; set; }
/// <summary>
/// true 同意，false 拒绝
/// </summary>
public bool? state { get; set; }
/// <summary>
/// 原因
/// </summary>
public string? reason { get; set; }
/// <summary>
/// 选择时间
/// </summary>
public DateTime? time { get; set; }
}
}
Write Preview
Loading…
Cancel
Save