diff --git a/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs b/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs
index 772cfd48..71eae8e6 100644
--- a/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Controllers/WorkGridsController.cs
@@ -183,6 +183,7 @@ public class WorkGridsController : ControllerBase
///
///
[HttpPost("user/attendance/upload")]
+ [Transactional]
public async Task ManuallyUploadAsync(List logIds)
{
await _workGridScheduleService.ManuallyUploadAsync(logIds);
diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs
index 16453987..60f700a5 100644
--- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs
+++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs
@@ -1,5 +1,4 @@
using Dlhis.Basic.Common.ApiLog.Services;
-using Dlhis.Basic.Organization.Services;
using Dlhis.Basic.WorkGrids.Request;
using Dlhis.Basic.WorkGrids.Response;
using Dlhis.Constants;
@@ -25,19 +24,16 @@ public class WorkGridScheduleService : IWorkGridScheduleService
private readonly IJinkoJipApi _jinkoJipApi;
private readonly IOperateLog _operateLog;
private readonly ICurrentUser _currentUser;
- private readonly IFactorySettingService _factorySettingService;
public WorkGridScheduleService(IDbContext dbContext,
IJinkoJipApi jinkoJipApi,
IOperateLog operateLog,
- ICurrentUser currentUser,
- IFactorySettingService factorySettingService)
+ ICurrentUser currentUser)
{
_dbContext = dbContext;
_jinkoJipApi = jinkoJipApi;
_operateLog = operateLog;
_currentUser = currentUser;
- _factorySettingService = factorySettingService;
}
public async Task SaveAsync(WorkGridScheduleSaveRequest request)
@@ -176,7 +172,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
///
public async Task ManuallyUploadAsync(List logIds)
{
- const string filterString = $"{{\"IsError\":true";
+ const string filterString = "{{\"IsError\":true";
var requests = await _dbContext.Queryable()
.LeftJoin((x, device) => x.DeviceUniqueNo == device.UniqueNo)
@@ -207,5 +203,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
}
}
}
+
+ await _operateLog.LogAsync(OperateLogType.WorkGrid, $"重提上传考勤:{requests.Select(x => x.Id).Join(",")}");
}
}
\ No newline at end of file