Browse Source

添加一个字段指示预约记录是否已经分配

develop
胡超1 2 years ago
parent
commit
292bc0b6fc
  1. 44
      24Hour/Controllers/Common/LawyerArchivesController.cs
  2. 2
      Elight.Entity/AppMode/App_LawyerServicesModel.cs

44
24Hour/Controllers/Common/LawyerArchivesController.cs

@ -362,6 +362,16 @@ namespace _24Hour.Controllers.Common
{ {
try try
{ {
var lawsvc =await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == dto.Id).FirstAsync();
if (lawsvc==null)
{
return Result.Error("预约信息不存在");
}
if (lawsvc.IsAssigned==true)
{
return Result.Error("当前预约信息已被分配");
}
var entity = mapper.Map<LawyerArchives>(dto); var entity = mapper.Map<LawyerArchives>(dto);
entity.Id = Guid.NewGuid().ToString(); entity.Id = Guid.NewGuid().ToString();
entity.createrId = _userdata.Id; entity.createrId = _userdata.Id;
@ -369,7 +379,10 @@ namespace _24Hour.Controllers.Common
entity.status = 0; entity.status = 0;
entity.copyStatus = 0; entity.copyStatus = 0;
entity.IsDeleted = 0; entity.IsDeleted = 0;
lawsvc.IsAssigned = true;
_db.BeginTran(); _db.BeginTran();
_db.Updateable(lawsvc).UpdateColumns(x => x.IsAssigned).ExecuteCommand();
var num = await _db.Insertable(entity).ExecuteCommandAsync(); var num = await _db.Insertable(entity).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
@ -578,7 +591,6 @@ namespace _24Hour.Controllers.Common
///} ///}
/// </remarks> /// </remarks>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("QueryDsrList")] [Route("QueryDsrList")]
public async Task<Result<AjgldsrxxDto>> QueryDsrList(string bmsah, string unitcode, string PartyIdCard) public async Task<Result<AjgldsrxxDto>> QueryDsrList(string bmsah, string unitcode, string PartyIdCard)
@ -823,8 +835,13 @@ namespace _24Hour.Controllers.Common
{ {
return await twentyClient.Arrange(input); return await twentyClient.Arrange(input);
} }
/// <summary>
/// 上传数据只2.0系统
/// </summary>
/// <param name="lawyerarchivesId"></param>
/// <returns></returns>
[HttpPost]
[Route("UploadDataToTwentyfourSys")]
public async Task<Result> UploadDataToTwentyfourSys(string lawyerarchivesId) public async Task<Result> UploadDataToTwentyfourSys(string lawyerarchivesId)
{ {
try try
@ -833,9 +850,14 @@ namespace _24Hour.Controllers.Common
var lawyersvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == lawyerArchives.Id).FirstAsync(); var lawyersvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == lawyerArchives.Id).FirstAsync();
var lawyer = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == lawyerArchives.lawyerId).FirstAsync(); var lawyer = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == lawyerArchives.lawyerId).FirstAsync();
var departmenginfo = await _db.Queryable<App_Sys_UnitModel>().Where(x => x.unitCode == _userdata.unitCode).FirstAsync(); var departmenginfo = await _db.Queryable<App_Sys_UnitModel>().Where(x => x.unitCode == _userdata.unitCode).FirstAsync();
logger.LogInformation($"get lawyerarchivesinfo:{lawyerArchives.ConvertToJsonStr()}");
logger.LogInformation($"get lawyersvcinfo:{lawyersvc.ConvertToJsonStr()}");
logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}");
logger.LogInformation($"get departmenginfo:{departmenginfo.ConvertToJsonStr()}");
var UnitCode = _userdata.unitCode; var UnitCode = _userdata.unitCode;
var UnitName = departmenginfo.unitjc; var UnitName = departmenginfo.unitjc;
var querylawyer = await QueryLsList(lawyer.identitycardId); var querylawyer = await QueryLsList(lawyer.identitycardId);
#region 数据检查
if (querylawyer.IsSucceed == true) if (querylawyer.IsSucceed == true)
{ {
if (querylawyer.result.content.Count <= 0) if (querylawyer.result.content.Count <= 0)
@ -886,6 +908,7 @@ namespace _24Hour.Controllers.Common
result.Message = "律师数据不存在"; result.Message = "律师数据不存在";
return result; return result;
} }
#endregion
var registerinforequest = await Register(new RegisterDto() var registerinforequest = await Register(new RegisterDto()
{ {
Bmsah = lawyerArchives.bmsah, Bmsah = lawyerArchives.bmsah,
@ -902,7 +925,7 @@ namespace _24Hour.Controllers.Common
{ {
"监护人" => "1424000000300", "监护人" => "1424000000300",
"近亲属" => "1424000000200", "近亲属" => "1424000000200",
_ => "" _ => "1424000000100"
}, },
Wtrydsrgxmc = lawyersvc.relationship switch Wtrydsrgxmc = lawyersvc.relationship switch
{ {
@ -991,7 +1014,6 @@ namespace _24Hour.Controllers.Common
return result; return result;
} }
} }
/// <summary> /// <summary>
/// PC端根据卷宗id获取卷宗信息 /// PC端根据卷宗id获取卷宗信息
/// </summary> /// </summary>
@ -1572,6 +1594,11 @@ namespace _24Hour.Controllers.Common
return Task.FromResult(result); return Task.FromResult(result);
} }
/// <summary>
/// 导入律师信息
/// </summary>
/// <param name="path"></param>
/// <returns></returns>
[HttpGet] [HttpGet]
[Route("ImportLawyerArchivesInfo")] [Route("ImportLawyerArchivesInfo")]
public async Task<Result> ImportLawyerArchivesInfo(string path) public async Task<Result> ImportLawyerArchivesInfo(string path)
@ -1767,6 +1794,11 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = true; result.IsSucceed = true;
return result; return result;
} }
/// <summary>
/// 导出律师信息
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
[HttpPost] [HttpPost]
[Route("ExportLawyerArchivesInfo")] [Route("ExportLawyerArchivesInfo")]
public async Task<Result> ExportLawyerArchivesInfo(List<string> ids) public async Task<Result> ExportLawyerArchivesInfo(List<string> ids)
@ -1924,7 +1956,7 @@ namespace _24Hour.Controllers.Common
[HttpPost] [HttpPost]
[Route("UploadSignImage")] [Route("UploadSignImage")]
/// <summary> /// <summary>
/// /// 上传签字照片
/// </summary> /// </summary>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns></returns> /// <returns></returns>

2
Elight.Entity/AppMode/App_LawyerServicesModel.cs

@ -181,5 +181,7 @@ namespace Elight.Entity
public string? mandatorcardId { get; set; } public string? mandatorcardId { get; set; }
[DataMember] [DataMember]
public string? relationship { get; set; } public string? relationship { get; set; }
[DataMember]
public bool? IsAssigned { get; set; }
} }
} }

Loading…
Cancel
Save