yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 调整创建人1

Browse Source
This commit is contained in:
liguoyang
2024-06-14 11:30:00 +08:00
parent b9b96f1bfc
commit 0452fca141
14 changed files with 23 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
View File

@@ -28,10 +28,9 @@ public class DevicePermissionsController : ControllerBase
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("assign")]
[Transactional]
[IgnoreTenant]
[DataPermission]
[AssignPermissionLimit]
[Transactional]
[DataPermission]
public async Task AssignAsync(DevicePermissionSaveRequest request)
{
await _devicePermissionService.AssignAsync(request);
@@ -42,9 +41,9 @@ public class DevicePermissionsController : ControllerBase
/// </summary>
/// <param name="request"></param>
[HttpPost("assign-unique")]
[Transactional]
[IgnoreTenant]
[AssignPermissionLimit]
[Transactional]
[DataPermission]
public async Task AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request)
{
await _devicePermissionService.AssignToUniqueAsync(request);

10
Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
View File

@@ -40,11 +40,7 @@ public class DeviceConnectService : IDeviceConnectService
LastHeartbeatTime = DateTime.Now,
RegisterTime = DateTime.Now,
BusinessPlaceCode = businessPlace?.Code,
TenantId = device.TenantId,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
TenantId = device.TenantId
};
await _dbContext.InsertAsync(registry);
@@ -181,10 +177,6 @@ public class DeviceConnectService : IDeviceConnectService
Enable = true,
AsAttendance = false,
DeployPosition = string.Empty,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
};
await _dbContext.InsertAsync(device);

12
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -176,7 +176,7 @@ public class DevicePermissionService : IDevicePermissionService
var current = await GetAssignDeviceCodesInternalAsync(userNos);
var deivces = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Enable).ToListAsync();
var waitTasks = new List<DeviceTaskEntity>();
foreach (var userNo in userNos)
@@ -204,18 +204,18 @@ public class DevicePermissionService : IDevicePermissionService
continue;
}
var deviceCodes = deivces.Where(x => deletedItems.Contains(x.Code) || addItems.Contains(x.Code)).Select(x => x.Code).ToList();
var deviceCodes = devices.Where(x => deletedItems.Contains(x.Code) || addItems.Contains(x.Code)).Select(x => x.Code).ToList();
deletedItems = deletedItems.Where(x => deviceCodes.Contains(x)).ToList();
addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList();
//下发任务创建
var toDeleted = deletedItems.Select(x => new DeviceTaskEntity
{
DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Type = DeviceTaskEnumType.Delete,
CancellationId = 0,
DeviceType = deivces.First(item => item.Code == x).Type,
DeviceType = devices.First(item => item.Code == x).Type,
UserNo = userNo,
Version = 0,
TenantId = tenant,
@@ -223,10 +223,10 @@ public class DevicePermissionService : IDevicePermissionService
var toAdd = addItems.Select(x => new DeviceTaskEntity
{
DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Type = DeviceTaskEnumType.Add,
DeviceType = deivces.First(item => item.Code == x).Type,
DeviceType = devices.First(item => item.Code == x).Type,
UserNo = userNo,
Version = 0,
TenantId = tenant,

5
Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
View File

@@ -167,11 +167,6 @@ public class DeviceService : IDeviceService
Type = DeviceUploadLogTypeEnumType.Raise,
UserUniqueNo = string.Empty,
RaiseDateTime = entity.CreateTime,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
});
}
}

18
Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
View File

@@ -14,11 +14,6 @@ public class GainfoOutsourceRequest
[Required(ErrorMessage = "姓名不可为空")]
public string Name { get; set; }
/// <summary>
/// 证件类型代码
/// </summary>
public string IdClass { get; set; }
/// <summary>
/// 证件号
/// </summary>
@@ -31,7 +26,7 @@ public class GainfoOutsourceRequest
public GenderEnumType Gender { get; set; }
/// <summary>
/// 生日
/// 出生日期
/// </summary>
public DateTime? Birthday { get; set; }
@@ -41,11 +36,6 @@ public class GainfoOutsourceRequest
[Required(ErrorMessage = "手机号不可为空")]
public string Phone { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 厂区
/// </summary>
@@ -61,6 +51,12 @@ public class GainfoOutsourceRequest
/// 离职日期
/// </summary>
public DateTime? ResignationDate { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 额外信息

10
Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
View File

@@ -98,11 +98,7 @@ public class GainfoFaceService : IGainfoFaceService
face = new GainfoFaceEntity
{
UserCode = gainfo.Code,
Face = request.Face,
CreateTime = DateTime.Now,
ModifiedTime = DateTime.Now,
CreatedBy = 1,
ModifiedBy = 1
Face = request.Face
};
await _faceDbContext.InsertAsync(face);
@@ -210,6 +206,10 @@ public class GainfoFaceService : IGainfoFaceService
await _faceDbContext.UpdateAsync(face);
}
var prefix = gainfo.Factory == "501" ? "jschuneng" : "jingke";
var url = $"https://pay.aizhuhotel.com/{prefix}/api/face";
//生成任务
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType);
}

4
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -335,10 +335,6 @@ public class GainfoService : IGainfoService
{
await faceDbContext.InsertAsync(new GainfoFaceEntity
{
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
UserCode = gainfo.Code,
Face = request.Face
});

5
Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
View File

@@ -200,11 +200,6 @@ public class MealSupplementRecordService : IMealSupplementRecordService
IsCostCrossTenant = false,
DepartmentNo = gainfo.DepartmentNo,
DeviceUniqueNo = null,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
});
}
}

6
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -504,8 +504,6 @@ public class BalanceService : IBalanceService
{
gainfoMeal = new GainfoMealEntity
{
CreatedBy = 1,
ModifiedBy = 1,
UserNo = gainfo.No,
UserCode = gainfo.Code,
Balance = 0,
@@ -561,10 +559,6 @@ public class BalanceService : IBalanceService
IsDeleted = false,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
});
var newBalance = gainfoMeal.Balance += request.Amount;

8
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -248,10 +248,6 @@ public class OrderService : BaseOrderService, IOrderService
UserNo = order.UserNo,
UserCode = order.UserCode,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
};
await DbContext.InsertAsync(gainfoMeal);
@@ -646,10 +642,6 @@ public class OrderService : BaseOrderService, IOrderService
UserNo = gainfo.No,
UserCode = gainfo.Code,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
};
await DbContext.InsertAsync(gainfoMeal);

18
Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
View File

@@ -63,11 +63,6 @@ public class CreateDefinitelyGroupJob : BaseJob
IsDefault = grp.Equals("*自定义人员分组"),
Editable = false,
Remark = _remark,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
TenantId = null
});
}
@@ -92,10 +87,6 @@ public class CreateDefinitelyGroupJob : BaseJob
AbleSetNext = false,
Remark = _remark,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
TenantId = null,
};
await DbContext.InsertAsync(topGrp);
@@ -116,11 +107,6 @@ public class CreateDefinitelyGroupJob : BaseJob
Editable = false,
AbleSetNext = false,
Remark = _remark,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
TenantId = workplace.Code,
};
await DbContext.InsertAsync(workplaceGrp);
@@ -141,10 +127,6 @@ public class CreateDefinitelyGroupJob : BaseJob
AbleSetNext = true,
Remark = _remark,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
TenantId = factory.Code,
});
}

5
Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs
View File

@@ -41,11 +41,6 @@ public class CreateGetUploadRecordJob : BaseJob
CancellationId = 0,
Priority = 50,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
})
.ToList();

5
Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs
View File

@@ -42,11 +42,6 @@ public class CreateSyncServerDateTimeJob : BaseJob
DeviceType = x.Type,
Priority = 49,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
}).ToList();
await DbContext.InsertAsync(tasks);

5
Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
View File

@@ -164,11 +164,6 @@ public class MealSupplementHandlerJob : BaseJob
DeviceUniqueNo = null,
IsDeleted = false,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
});
var r = await _jinkoJIPService.SyncMealSupplementRecordsAsync(new List<SyncMealSupplementRecordRequest>