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

修改接口

develop
胡超1 2 years ago
parent
3a8e5ffbc6
commit
2eac2bb1ce
3 changed files with 123 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      24Hour/Controllers/Common/CommonController.cs
  2. 106
      24Hour/Controllers/Common/LawyerArchivesController.cs
  3. 11
      24Hour/Controllers/Common/LawyerservicesController.cs

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

@ -393,6 +393,33 @@ namespace _24Hour.Controllers.Common
return result; return result;
} }
/// <summary> /// <summary>
/// 检察官待办查询
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("CountReservationInfoByProsecutor")]
public async Task<Result> CountReservationInfoByProsecutor()
{
try
{
var lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
.Where(x => x.state == 0)
.Where(x => x.IsDeleted == 0)
.CountAsync();
result.result = new
{
Count = lawyerdata,
};
result.IsSucceed = true;
}
catch (Exception)
{
result.IsSucceed = false;
throw;
}
return result;
}
/// <summary>
/// 修改预约申请状态 /// 修改预约申请状态
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>

106
24Hour/Controllers/Common/LawyerArchivesController.cs
Unescape View File

@ -362,12 +362,12 @@ namespace _24Hour.Controllers.Common
{ {
try try
{ {
var lawsvc =await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == dto.Id).FirstAsync(); var lawsvc = await _db.Queryable<App_LawyerServicesModel>().Where(x => x.Id == dto.lawyerserviceId).FirstAsync();
if (lawsvc==null) if (lawsvc == null)
{ {
return Result.Error("预约信息不存在"); return Result.Error("预约信息不存在");
} }
if (lawsvc.IsAssigned==true) if (lawsvc.IsAssigned == true)
{ {
return Result.Error("当前预约信息已被分配"); return Result.Error("当前预约信息已被分配");
} }
@ -846,16 +846,43 @@ namespace _24Hour.Controllers.Common
try try
{ {
var lawyerArchives = await _db.Queryable<LawyerArchives>().Where(x => x.Id == lawyerarchivesId).FirstAsync(); var lawyerArchives = await _db.Queryable<LawyerArchives>().Where(x => x.Id == lawyerarchivesId).FirstAsync();
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.lawyerserviceId).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 lawyerarchivesinfo:{lawyerArchives.ConvertToJsonStr()}");
logger.LogInformation($"get lawyersvcinfo:{lawyersvc.ConvertToJsonStr()}"); logger.LogInformation($"get lawyersvcinfo:{lawyersvc.ConvertToJsonStr()}");
logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}"); logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}");
logger.LogInformation($"get departmenginfo:{departmenginfo.ConvertToJsonStr()}"); logger.LogInformation($"get departmenginfo:{departmenginfo.ConvertToJsonStr()}");
var bmsah= lawyerArchives.bmsah;
var partyIDcard = lawyersvc.partyIDcard;
var party = lawyersvc.party;
var identitycardId = lawyer.identitycardId;
var lawyerphone = lawyer.phone;
var mandator = lawyersvc.mandator;
var lawyerdepartmentUnifiedSocialCreditCode = lawyer.departmentUnifiedSocialCreditCode;
var relationship = lawyersvc.relationship;
var permissibleStartTime = lawyerArchives.permissibleStartTime?.ToString("yyyy-MM-dd");
var permissibleEndTime = lawyerArchives.permissibleEndTime?.ToString("yyyy-MM-dd");
//if (true)
//{
// bmsah = "安北检刑诉受[2023]410503000002号";
// partyIDcard = "410502199606164872";
// party = "李四";
// identitycardId = "123445788876677";
// lawyerphone = "1234";
// mandator = "张三";
// lawyerdepartmentUnifiedSocialCreditCode = "123123123";
// relationship = "本人";
// permissibleStartTime = "2023-11-11";
// permissibleEndTime = "2023-12-11";
//}
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(identitycardId);
#region 数据检查 #region 数据检查
if (querylawyer.IsSucceed == true) if (querylawyer.IsSucceed == true)
{ {
@ -873,7 +900,7 @@ namespace _24Hour.Controllers.Common
return result; return result;
} }
var querydsr = await QueryDsrList(lawyerArchives.bmsah, UnitCode, lawyersvc.partyIDcard); var querydsr = await QueryDsrList(bmsah, UnitCode, partyIDcard);
if (querydsr.IsSucceed == true) if (querydsr.IsSucceed == true)
{ {
if (querydsr.result.list.Count <= 0) if (querydsr.result.list.Count <= 0)
@ -910,23 +937,23 @@ namespace _24Hour.Controllers.Common
#endregion #endregion
var registerinforequest = await Register(new RegisterDto() var registerinforequest = await Register(new RegisterDto()
{ {
Bmsah = lawyerArchives.bmsah, Bmsah = bmsah,
UnitCode = UnitCode, UnitCode = UnitCode,
UnitName = UnitName, UnitName = UnitName,
PartyIdCard = lawyersvc.partyIDcard, PartyIdCard = partyIDcard,
PartyConsignor = lawyersvc.party, PartyConsignor = party,
ProposerZJHM = lawyer.identitycardId, ProposerZJHM = identitycardId,
ProposerType = "", ProposerType = "",
ProposerTel = lawyer.phone, ProposerTel = lawyerphone,
ProposerSCC = lawyer.departmentUnifiedSocialCreditCode, ProposerSCC = lawyerdepartmentUnifiedSocialCreditCode,
Wtr = lawyersvc.mandator, Wtr = mandator,
Wtrydsrgxdm = lawyersvc.relationship switch Wtrydsrgxdm = relationship switch
{ {
"监护人" => "1424000000300", "监护人" => "1424000000300",
"近亲属" => "1424000000200", "近亲属" => "1424000000200",
_ => "1424000000100" _ => "1424000000100"
}, },
Wtrydsrgxmc = lawyersvc.relationship switch Wtrydsrgxmc = relationship switch
{ {
"监护人" => "监护人", "监护人" => "监护人",
"近亲属" => "近亲属", "近亲属" => "近亲属",
@ -940,6 +967,45 @@ namespace _24Hour.Controllers.Common
if (registerinforequest.IsSucceed == true) if (registerinforequest.IsSucceed == true)
{ {
var registerinfo = registerinforequest.result; var registerinfo = registerinforequest.result;
var UploadPhoto = async (string? photoarr, string? typecode) =>
{
if (string.IsNullOrEmpty(photoarr) || string.IsNullOrEmpty(typecode))
return;
var identityphotos = photoarr?.ConvertToModel<List<string>>();
if (identityphotos?.Any() == true)
{
foreach (var item in identityphotos)
{
var filepath = Path.Combine(Environment.CurrentDirectory, item);
filepath = filepath.Replace(@"/", @"\");
await twentyClient.UploadImage(new UploadDto()
{
Bmsah = registerinfo.bmsah,
FileName = Path.GetFileName(filepath),
Code = typecode,
UnitCode = registerinfo.dwbm,
UnitName = UnitName,
ImageStr = Convert.ToBase64String(Encoding.UTF8.GetBytes(System.IO.File.ReadAllText(filepath)))
});
}
}
};
/// 1423000000100-律师执业证书,1423000000200-律师事务所证, 1423000000300- 授权委托书, 1423000000400- 法律援助公函,1423000000500-身份证件 ,1423000000600-关系证明材料, 1423000000700- 其他
await Task.WhenAll(
UploadPhoto(lawyer.identityphoto, "1423000000100"),
UploadPhoto(lawyer.departmentPhoto, "1423000000200"),
UploadPhoto(lawyersvc.annex, "1423000000300"),
UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400"),
UploadPhoto(lawyer.cardIdphoto, "1423000000500"),
UploadPhoto(lawyersvc.relationshipProofPhoto, "1423000000600"),
UploadPhoto(lawyersvc.otherPhoto, "1423000000700")
)
.ContinueWith((x) =>
{
logger.LogInformation("图片上传成功");
});
var applymarkingrequest = await ApplyMarKing(new() var applymarkingrequest = await ApplyMarKing(new()
{ {
bhdlbh = registerinfo.bhdlbh, bhdlbh = registerinfo.bhdlbh,
@ -956,7 +1022,7 @@ namespace _24Hour.Controllers.Common
sqrsfdm = registerinfo.bhdlYxSqrInsertInputDto.sqrsfdm, sqrsfdm = registerinfo.bhdlYxSqrInsertInputDto.sqrsfdm,
sxlxdm = "1405187400001", sxlxdm = "1405187400001",
sxlxmc = "申请阅卷", sxlxmc = "申请阅卷",
zrrmc = lawyersvc.party zrrmc = party
}); });
if (applymarkingrequest.IsSucceed == true) if (applymarkingrequest.IsSucceed == true)
@ -975,8 +1041,8 @@ namespace _24Hour.Controllers.Common
sxbh = applymarkinginfo.sxbh, sxbh = applymarkinginfo.sxbh,
yjfsdm = "", yjfsdm = "",
yjfsmc = "", yjfsmc = "",
yjjzsj = lawyerArchives.permissibleStartTime?.ToString("yyyy-MM-dd"), yjjzsj = permissibleStartTime,
yjkssj = lawyerArchives.permissibleEndTime?.ToString("yyyy-MM-dd"), yjkssj = permissibleEndTime,
}); });
if (Arrangerequest.IsSucceed == true) if (Arrangerequest.IsSucceed == true)
{ {
@ -2001,6 +2067,8 @@ namespace _24Hour.Controllers.Common
return result; return result;
} }
public class DecodeQRDataModel public class DecodeQRDataModel
{ {
public string QRData { get; set; } public string QRData { get; set; }
@ -2065,4 +2133,4 @@ namespace _24Hour.Controllers.Common
//} //}
#endregion #endregion
} }
} }

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

@ -85,16 +85,23 @@ namespace _24Hour.Controllers.Common
public async Task<Result> QueryLawyer(App_LawyerServicesInput Lawyerdata) public async Task<Result> QueryLawyer(App_LawyerServicesInput Lawyerdata)
{ {
RefAsync<int> totalNumber = 0;//总数据 RefAsync<int> totalNumber = 0;//总数据
//查询律师服务 //查询律师服务
var list = await _db.Queryable<App_LawyerServicesModel>() var list = await _db.Queryable<App_LawyerServicesModel>()
.Where(q => q.IsDeleted == 0)
.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)
.WhereIF(string.IsNullOrEmpty(Lawyerdata.Id) == false, q => q.Id == Lawyerdata.Id)
.WhereIF(_userdata.phone != "admin", q => q.unitCode == _userdata.unitCode) .WhereIF(_userdata.phone != "admin", q => q.unitCode == _userdata.unitCode)
.OrderByDescending(q => q.creationtime).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber); .OrderByDescending(q => q.creationtime)
.ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber);
Lawyerdata.RowsCount = totalNumber; Lawyerdata.RowsCount = totalNumber;
var data = new QueryResult<App_LawyerServicesModel>(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList()); var data = new QueryResult<App_LawyerServicesModel>(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList());
result.IsSucceed = true; result.IsSucceed = true;

Write Preview
Loading…
Cancel
Save