添加双屏
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
6e92895043
commit
955ca4a1a6
|
|
@ -16656,6 +16656,11 @@
|
|||
<member name="T:IRaCIS.Core.Application.ViewModel.UserWLTemplateQuery">
|
||||
<summary>UserWLTemplateQuery 列表查询参数模型</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.SetAutoCutNextTaskInDto.IsDoubleScreen">
|
||||
<summary>
|
||||
是否双屏
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.UserWLTemplateAddOrEdit">
|
||||
<summary> UserWLTemplateAddOrEdit 列表查询参数模型</summary>
|
||||
</member>
|
||||
|
|
|
|||
|
|
@ -30,6 +30,11 @@ namespace IRaCIS.Core.Application.ViewModel
|
|||
public class SetAutoCutNextTaskInDto
|
||||
{
|
||||
public bool AutoCutNextTask { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否双屏
|
||||
/// </summary>
|
||||
public bool IsDoubleScreen { get; set; } = false;
|
||||
}
|
||||
|
||||
///<summary> UserWLTemplateAddOrEdit 列表查询参数模型</summary>
|
||||
|
|
|
|||
|
|
@ -85,10 +85,22 @@ namespace IRaCIS.Core.Application.Service
|
|||
public async Task<object> GetAutoCutNextTask()
|
||||
{
|
||||
|
||||
return await _userRoleRepository.Where(x => x.Id == _userInfo.UserRoleId).Select(x => new
|
||||
var result = await _userRoleRepository.Where(x => x.Id == _userInfo.UserRoleId).Select(x => new
|
||||
{
|
||||
AutoCutNextTask = x.AutoCutNextTask
|
||||
}).FirstNotNullAsync();
|
||||
AutoCutNextTask = x.AutoCutNextTask,
|
||||
IsDoubleScreen = x.IsDoubleScreen,
|
||||
}).FirstOrDefaultAsync();
|
||||
|
||||
if (result == null)
|
||||
{
|
||||
return new
|
||||
{
|
||||
AutoCutNextTask = false,
|
||||
IsDoubleScreen = false,
|
||||
};
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -103,7 +115,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
await _userRoleRepository.UpdatePartialFromQueryAsync(_userInfo.UserRoleId, x => new UserRole()
|
||||
{
|
||||
|
||||
AutoCutNextTask = inDto.AutoCutNextTask
|
||||
AutoCutNextTask = inDto.AutoCutNextTask,
|
||||
IsDoubleScreen = inDto.IsDoubleScreen
|
||||
});
|
||||
|
||||
await _userRoleRepository.SaveChangesAsync();
|
||||
|
|
|
|||
|
|
@ -40,6 +40,11 @@ public class UserRole : BaseFullAuditEntity
|
|||
[Comment("自动切换下一个任务")]
|
||||
public bool AutoCutNextTask { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否双屏
|
||||
/// </summary>
|
||||
public bool IsDoubleScreen { get; set; } = false;
|
||||
|
||||
|
||||
|
||||
[Comment("医生生成账号后,会有值")]
|
||||
|
|
|
|||
20979
IRaCIS.Core.Infra.EFCore/Migrations/20251105052214_IsDoubleScreen.Designer.cs
generated
Normal file
20979
IRaCIS.Core.Infra.EFCore/Migrations/20251105052214_IsDoubleScreen.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,29 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class IsDoubleScreen : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "IsDoubleScreen",
|
||||
table: "User",
|
||||
type: "bit",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "IsDoubleScreen",
|
||||
table: "User");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14964,6 +14964,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
b.Property<Guid>("IdentityUserId")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<bool>("IsDoubleScreen")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("IsUserRoleDisabled")
|
||||
.HasColumnType("bit");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue