333
This commit is contained in:
parent
b0d2592ddb
commit
830732aeeb
|
|
@ -463,6 +463,8 @@ namespace ZR.Admin.WebApi.Controllers
|
||||||
// 查询相关的工作人员
|
// 查询相关的工作人员
|
||||||
var workers = await _CamWorkerService.AsQueryable().Where(it => it.WorkrecordId == id).ToListAsync();
|
var workers = await _CamWorkerService.AsQueryable().Where(it => it.WorkrecordId == id).ToListAsync();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
// 删除图片文件
|
// 删除图片文件
|
||||||
if (!string.IsNullOrEmpty(workRecord.ImageUrl))
|
if (!string.IsNullOrEmpty(workRecord.ImageUrl))
|
||||||
{
|
{
|
||||||
|
|
@ -533,6 +535,11 @@ namespace ZR.Admin.WebApi.Controllers
|
||||||
CleanEmptyDirectories(Path.Combine(WebHostEnvironment.WebRootPath, "workfiles", workRecord.RecordTime?.ToString("yyyyMM/yyyyMMdd")));
|
CleanEmptyDirectories(Path.Combine(WebHostEnvironment.WebRootPath, "workfiles", workRecord.RecordTime?.ToString("yyyyMM/yyyyMMdd")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"删除文件失败,错误: {ex.Message}");
|
||||||
|
}
|
||||||
// 删除工作人员记录
|
// 删除工作人员记录
|
||||||
await _CamWorkerService.DeleteAsync(it => it.WorkrecordId == id);
|
await _CamWorkerService.DeleteAsync(it => it.WorkrecordId == id);
|
||||||
|
|
||||||
|
|
@ -577,7 +584,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
public async Task<IActionResult> DownloadZip([FromQuery] string? yearMoney)
|
public async Task<IActionResult> DownloadZip([FromQuery] string? yearMoney)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(yearMoney)|| yearMoney=="null")
|
if (string.IsNullOrEmpty(yearMoney) || yearMoney == "null")
|
||||||
{
|
{
|
||||||
yearMoney = DateTime.Now.ToString("yyyyMM");
|
yearMoney = DateTime.Now.ToString("yyyyMM");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user