diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
index c3b1cd11..30aa905b 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
@@ -28,10 +28,9 @@ public class DevicePermissionsController : ControllerBase
///
///
[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
///
///
[HttpPost("assign-unique")]
- [Transactional]
- [IgnoreTenant]
[AssignPermissionLimit]
+ [Transactional]
+ [DataPermission]
public async Task AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request)
{
await _devicePermissionService.AssignToUniqueAsync(request);
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
index 629294ea..55d6cf4e 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
@@ -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);
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index ccedd1a5..73adb9eb 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -176,7 +176,7 @@ public class DevicePermissionService : IDevicePermissionService
var current = await GetAssignDeviceCodesInternalAsync(userNos);
- var deivces = await _dbContext.Queryable().Where(x => x.Enable).ToListAsync();
+ var devices = await _dbContext.Queryable().Where(x => x.Enable).ToListAsync();
var waitTasks = new List();
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,
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index 5d1949f8..1565dd45 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -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,
});
}
}
diff --git a/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs b/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
index 1efc7e7a..a6a23441 100644
--- a/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
+++ b/Src/Dlhis.Basic/Organization/Request/GainfoOutsourceRequest.cs
@@ -14,11 +14,6 @@ public class GainfoOutsourceRequest
[Required(ErrorMessage = "姓名不可为空")]
public string Name { get; set; }
- ///
- /// 证件类型代码
- ///
- public string IdClass { get; set; }
-
///
/// 证件号
///
@@ -31,7 +26,7 @@ public class GainfoOutsourceRequest
public GenderEnumType Gender { get; set; }
///
- /// 生日
+ /// 出生日期
///
public DateTime? Birthday { get; set; }
@@ -41,11 +36,6 @@ public class GainfoOutsourceRequest
[Required(ErrorMessage = "手机号不可为空")]
public string Phone { get; set; }
- ///
- /// 备注
- ///
- public string Remark { get; set; }
-
///
/// 厂区
///
@@ -61,6 +51,12 @@ public class GainfoOutsourceRequest
/// 离职日期
///
public DateTime? ResignationDate { get; set; }
+
+
+ ///
+ /// 备注
+ ///
+ public string Remark { get; set; }
///
/// 额外信息
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
index 5ee0898d..cf0fffd4 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
@@ -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);
}
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
index bd7f5fc0..54f057da 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -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
});
diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
index bebd1de0..2175617f 100644
--- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
+++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
@@ -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,
});
}
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 5da5d96a..e66033da 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -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;
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 69675b4c..a962d085 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -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);
diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
index 3169a8ec..40cc38fe 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
@@ -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,
});
}
diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs
index 517fbd6f..ae2b2bed 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs
@@ -41,11 +41,6 @@ public class CreateGetUploadRecordJob : BaseJob
CancellationId = 0,
Priority = 50,
- CreatedBy = 1,
- CreateTime = DateTime.Now,
- ModifiedBy = 1,
- ModifiedTime = DateTime.Now,
-
})
.ToList();
diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs
index e4e6dde6..2acfe62d 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs
@@ -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);
diff --git a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
index ab44ca54..35e1b33c 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/MealSupplementHandlerJob.cs
@@ -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