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

迁移律师事务所证明字段至律师服务

develop-FileUpload-test
胡超1 2 years ago
parent
709bc35e1f
commit
bb8cb03009
3 changed files with 87 additions and 81 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. 42
      24Hour/Controllers/Common/LawyerArchivesController.cs
  2. 2
      24Hour/Controllers/LoginController.cs
  3. 124
      24Hour/Controllers/system/SystemControllerController.cs

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

@ -1079,7 +1079,7 @@ namespace _24Hour.Controllers.Common
await UploadPhoto(lawyer.identityphoto, "1423000000100");
await UploadPhoto(lawyer.departmentPhoto, "1423000000200");
await UploadPhoto(lawyersvc.departmentPhoto, "1423000000200");
await UploadPhoto(lawyersvc.annex, "1423000000300");
await UploadPhoto(lawyersvc.legalAidPhoto, "1423000000400");
await UploadPhoto(lawyer.cardIdphoto, "1423000000500");
@ -1824,7 +1824,7 @@ namespace _24Hour.Controllers.Common
{
userim.cardIdphoto = cardids;
userim.identityphoto = files;
userim.departmentPhoto = departments;
userim.unitCode = _userdata.unitCode;
userim.identity = "律师";
userim.IsDeleted = 0;
@ -1836,7 +1836,6 @@ namespace _24Hour.Controllers.Common
{
user.cardIdphoto = cardids;
user.identityphoto = files;
user.departmentPhoto = departments;
user.unitCode = _userdata.unitCode;
user.identity = "律师";
user.IsDeleted = 0;
@ -1846,7 +1845,6 @@ namespace _24Hour.Controllers.Common
{
x.cardIdphoto,
x.identityphoto,
x.departmentPhoto,
x.unitCode,
x.identity,
x.IsDeleted
@ -1894,6 +1892,14 @@ namespace _24Hour.Controllers.Common
.ToList()
.ConvertToJsonStr();
var departmentPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "departmentPhoto");
var departmentPhotos = new DirectoryInfo(departmentPhoto)
.GetFiles()
.Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
.Replace(@"\", @"/"))
.ToList()
.ConvertToJsonStr();
if (svc == null)
{
var lawyer = await _db.Queryable<App_Sys_UserModel>()
@ -1908,6 +1914,7 @@ namespace _24Hour.Controllers.Common
lawyersvc.legalAidPhoto = legalAidPhotos;
lawyersvc.relationshipProofPhoto = relationshipProofPhotos;
lawyersvc.otherPhoto = otherPhotos;
lawyersvc.departmentPhoto = departmentPhotos;
lawyersvc.IsAssigned = false;
_db.BeginTran();
var num = await _db.Insertable(lawyersvc).ExecuteCommandAsync();
@ -2027,6 +2034,7 @@ namespace _24Hour.Controllers.Common
packetPhotoField(item?.legalAidPhoto, "legalAidPhoto");
packetPhotoField(item?.relationshipProofPhoto, "relationshipProofPhoto");
packetPhotoField(item?.otherPhoto, "otherPhoto");
packetPhotoField(item?.departmentPhoto, "departmentPhoto");
}
//存储用户的相关附件
foreach (var item in users)
@ -2062,19 +2070,19 @@ namespace _24Hour.Controllers.Common
}
}
var departmentPhotos = item.departmentPhoto.ConvertToModel<List<string>>();
var departmentPhotosDir = Path.Combine(userdir, "departmentPhotos");
if (Directory.Exists(departmentPhotosDir) == false) Directory.CreateDirectory(departmentPhotosDir);
foreach (var file in departmentPhotos)
{
//var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
var urlpath = file.Split('/');
var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot", Path.Combine(urlpath));
if (System.IO.File.Exists(filepath))
{
System.IO.File.Copy(filepath, Path.Combine(departmentPhotosDir, Path.GetFileName(filepath)), true);
}
}
////var departmentPhotos = item.departmentPhoto.ConvertToModel<List<string>>();
////var departmentPhotosDir = Path.Combine(userdir, "departmentPhotos");
////if (Directory.Exists(departmentPhotosDir) == false) Directory.CreateDirectory(departmentPhotosDir);
////foreach (var file in departmentPhotos)
////{
//// //var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
//// var urlpath = file.Split('/');
//// var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot", Path.Combine(urlpath));
//// if (System.IO.File.Exists(filepath))
//// {
//// System.IO.File.Copy(filepath, Path.Combine(departmentPhotosDir, Path.GetFileName(filepath)), true);
//// }
////}
}
logger.LogInformation("step4");
ZipFile.CreateFromDirectory(packegdir, packegzipname);

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

@ -446,7 +446,6 @@ namespace _24Hour.Controllers
unitCode = date.unitCode,
token = tokenString,
openId = date.wechatId,
departmentPhoto = date.departmentPhoto,
identityphoto = date.identityphoto,
cardIdphoto = date.cardIdphoto,
departmentName = date.departmentName,
@ -522,7 +521,6 @@ namespace _24Hour.Controllers
data.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower();
data.cardIdphoto = UserModel.cardIdphoto;
data.identityphoto = UserModel.identityphoto;
data.departmentPhoto = UserModel.departmentPhoto;
var num = await _db.Updateable(data).IgnoreColumns(true).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)

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

@ -695,74 +695,74 @@ namespace _24Hour.Controllers.system
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
[HttpGet]
[Route("EditDepartmentPhoto")]
public async Task<Result> EditDepartmentPhoto(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.departmentPhoto = 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;
}
//[HttpGet]
//[Route("EditDepartmentPhoto")]
//public async Task<Result> EditDepartmentPhoto(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.departmentPhoto = 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>
/// 根据律师id修改律师事务所证明图片
/// </summary>
/// <param name="photo"></param>
/// <param name="lawyerid"></param>
/// <returns></returns>
[HttpPost]
[Route("EditLawyerDepartmentPhoto")]
public async Task<Result> EditLawyerDepartmentPhoto(EditLawyerInput input)
{
try
{
_db.BeginTran();
var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync();
userlist.ForEach(q =>
{
//头像地址
q.departmentPhoto = input.photo.ConvertToJsonStr();
});
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;
}
//[HttpPost]
//[Route("EditLawyerDepartmentPhoto")]
//public async Task<Result> EditLawyerDepartmentPhoto(EditLawyerInput input)
//{
// try
// {
// _db.BeginTran();
// var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync();
// userlist.ForEach(q =>
// {
// //头像地址
// q.departmentPhoto = input.photo.ConvertToJsonStr();
// });
// 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;
//}
public class EditLawyerInput
{
public string[] photo { get; set; }

Write Preview
Loading…
Cancel
Save