XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-09-15 13:33:53 +08:00
parent 170f67084a
commit cc963ee9f6
6 changed files with 139 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -3016,11 +3016,6 @@
修约小数点 修约小数点
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionId">
<summary>
标准ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionName">
<summary> <summary>
标准 标准
@ -3031,6 +3026,16 @@
是否启用 是否启用
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.ShowOrder">
<summary>
排序
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.IsCompleteConfig">
<summary>
是否完成配置
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemViewInDto"> <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemViewInDto">
<summary> <summary>
@ -3601,6 +3606,16 @@
序号标记 序号标记
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemCriterionSelectDto.Id">
<summary>
返回的对象
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemCriterionSelectDto.CriterionName">
<summary>
标准
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemView.Id"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemView.Id">
<summary> <summary>
返回的对象 返回的对象
@ -7854,9 +7869,9 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetSystemCriterionDisable(System.Guid,System.Nullable{System.Guid})"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetSystemCriterionSelectList">
<summary> <summary>
设置系统标准被禁用 获取系统问题标准下拉
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
@ -7881,10 +7896,11 @@
<param name="systemCriterionId"></param> <param name="systemCriterionId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddSystemQuestionCriterion"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionCriterionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto)">
<summary> <summary>
添加系统问题标准 新增修改系统问题标准
</summary> </summary>
<param name="indto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto)"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto)">

18
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -108,15 +108,15 @@ namespace IRaCIS.Application.Services
VerifyMsg = $"已有{addOrEditBasic.Code}名称的字典", VerifyMsg = $"已有{addOrEditBasic.Code}名称的字典",
IsVerify= addOrEditBasic.ParentId ==null IsVerify= addOrEditBasic.ParentId ==null
}; };
// 验证阅片标准是否可禁用 //// 验证阅片标准是否可禁用
if (!addOrEditBasic.IsEnable&&addOrEditBasic.Id!=null) //if (!addOrEditBasic.IsEnable&&addOrEditBasic.Id!=null)
{ //{
var result = await _readingQuestionService.SetSystemCriterionDisable(addOrEditBasic.Id.Value,addOrEditBasic.ParentId); // var result = await _readingQuestionService.SetSystemCriterionDisable(addOrEditBasic.Id.Value,addOrEditBasic.ParentId);
if (!result.IsSuccess) // if (!result.IsSuccess)
{ // {
return result; // return result;
} // }
} //}
var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1); var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1);
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());
} }

27
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -354,11 +354,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid? Id { get; set; } public Guid? Id { get; set; }
/// <summary>
/// 标准ID
/// </summary>
public Guid CriterionId { get; set; }
/// <summary> /// <summary>
/// 标准 /// 标准
/// </summary> /// </summary>
@ -368,6 +363,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 是否启用 /// 是否启用
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; } = false;
} }
/// <summary> /// <summary>
@ -1099,6 +1104,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string OrderMark { get; set; } = string.Empty; public string OrderMark { get; set; } = string.Empty;
} }
public class GetSystemCriterionSelectDto
{
/// <summary>
/// 返回的对象
/// </summary>
public Guid Id { get; set; }
/// <summary>
/// 标准
/// </summary>
public string CriterionName { get; set; }
}
public class ReadingQuestionCriterionSystemView public class ReadingQuestionCriterionSystemView
{ {

2
IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
View File

@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Contracts
{ {
public interface IReadingQuestionService public interface IReadingQuestionService
{ {
Task<IResponseOutput> SetSystemCriterionDisable(Guid dictionaryId, Guid? parentId); //Task<IResponseOutput> SetSystemCriterionDisable(Guid dictionaryId, Guid? parentId);
Task SynchronizeCriterion(SynchronizeCriterionInDto inDto); Task SynchronizeCriterion(SynchronizeCriterionInDto inDto);

125
IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
View File

@ -675,7 +675,7 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<PageOutput<ReadingQuestionCriterionSystemView>> GetReadingQuestionCriterionSystemList(ReadingQuestionCriterionSystemViewInDto inDto) public async Task<PageOutput<ReadingQuestionCriterionSystemView>> GetReadingQuestionCriterionSystemList(ReadingQuestionCriterionSystemViewInDto inDto)
{ {
await AddSystemQuestionCriterion(); //await AddSystemQuestionCriterion();
var query= _readingQuestionCriterionSystemRepository.AsQueryable() var query= _readingQuestionCriterionSystemRepository.AsQueryable()
.WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName)) .WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
.ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider) .ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider)
@ -686,30 +686,48 @@ namespace IRaCIS.Application.Services
/// <summary> /// <summary>
/// 设置系统标准被禁用 /// 获取系统问题标准下拉
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[NonDynamicMethod] [HttpPost]
public async Task<IResponseOutput> SetSystemCriterionDisable(Guid dictionaryId, Guid? parentId) public async Task<List<GetSystemCriterionSelectDto>> GetSystemCriterionSelectList()
{ {
// 判断是否是阅片 var criterionList = await _readingQuestionCriterionSystemRepository.AsQueryable()
if (await _dictionaryRepository.AnyAsync(x => x.Id == parentId && x.Code == "ReadingStandard")) .Select(x => new GetSystemCriterionSelectDto()
{ {
// 判断当前阅片是否在项目里面存在 Id = x.Id,
var systemCriterion = await _readingQuestionCriterionSystemRepository.FirstOrDefaultAsync(x => x.CriterionId == dictionaryId); CriterionName = x.CriterionName
if (systemCriterion != null) }).ToListAsync();
{ return criterionList;
var trialCriterionIds = await _readingQuestionCriterionTrialRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterion.Id).Select(x=>x.ReadingQuestionCriterionSystemId).ToListAsync();
await _readingQuestionCriterionTrialRepository.BatchDeleteNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == systemCriterion.Id);
await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => trialCriterionIds.Contains(x.ReadingQuestionCriterionTrialId));
return ResponseOutput.Ok();
}
}
return ResponseOutput.Ok();
} }
///// <summary>
///// 设置系统标准被禁用
///// </summary>
///// <returns></returns>
//[NonDynamicMethod]
//public async Task<IResponseOutput> SetSystemCriterionDisable(Guid dictionaryId, Guid? parentId)
//{
// // 判断是否是阅片
// if (await _dictionaryRepository.AnyAsync(x => x.Id == parentId && x.Code == "ReadingStandard"))
// {
// // 判断当前阅片是否在项目里面存在
// var systemCriterion = await _readingQuestionCriterionSystemRepository.FirstOrDefaultAsync(x => x.CriterionId == dictionaryId);
// if (systemCriterion != null)
// {
// var trialCriterionIds = await _readingQuestionCriterionTrialRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterion.Id).Select(x=>x.ReadingQuestionCriterionSystemId).ToListAsync();
// await _readingQuestionCriterionTrialRepository.BatchDeleteNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == systemCriterion.Id);
// await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => trialCriterionIds.Contains(x.ReadingQuestionCriterionTrialId));
// return ResponseOutput.Ok();
// }
// }
// return ResponseOutput.Ok();
//}
/// <summary> /// <summary>
/// 设置系统问题标准是否完成配置 /// 设置系统问题标准是否完成配置
/// </summary> /// </summary>
@ -897,37 +915,58 @@ namespace IRaCIS.Application.Services
/// <summary> /// <summary>
/// 添加系统问题标准 /// 新增修改系统问题标准
/// </summary> /// </summary>
/// <param name="indto"></param>
/// <returns></returns> /// <returns></returns>
[NonDynamicMethod] [HttpPost]
private async Task AddSystemQuestionCriterion() public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionSystem(AddOrUpdateReadingQuestionCriterionSystemInDto indto)
{ {
var useSystemQuestionCriterionIds = _readingQuestionCriterionSystemRepository.Select(x => x.CriterionId); var entity = await _readingQuestionCriterionSystemRepository.InsertOrUpdateAsync(indto, true);
var dictionaryParentId =await _dictionaryRepository.Where(x => x.Code == "ReadingStandard").Select(x => x.Id).FirstOrDefaultAsync();
var criterionList = await _dictionaryRepository.Where(x => x.ParentId == dictionaryParentId && !useSystemQuestionCriterionIds.Contains(x.Id)) if (indto.Id != null)
.Select(x => new CriterionList()
{
Id = x.Id,
Value = x.Value,
ShowOrder=x.ShowOrder,
}).ToListAsync();
List<ReadingQuestionCriterionSystem> needAddCriterionList = new List<ReadingQuestionCriterionSystem>();
criterionList.ForEach(x =>
{ {
needAddCriterionList.Add(new ReadingQuestionCriterionSystem() await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == indto.Id, x => new ReadingQuestionCriterionTrial() {
{ CriterionName=indto.CriterionName
CriterionId = x.Id,
ShowOrder=x.ShowOrder,
CriterionName = x.Value,
IsEnable = false,
}); });
}); }
await _readingQuestionCriterionSystemRepository.AddRangeAsync(needAddCriterionList); return ResponseOutput.Ok(entity.Id.ToString());
await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
} }
///// <summary>
///// 添加系统问题标准
///// </summary>
///// <returns></returns>
//[NonDynamicMethod]
//private async Task AddSystemQuestionCriterion()
//{
// var useSystemQuestionCriterionIds = _readingQuestionCriterionSystemRepository.Select(x => x.CriterionId);
// var dictionaryParentId =await _dictionaryRepository.Where(x => x.Code == "ReadingStandard").Select(x => x.Id).FirstOrDefaultAsync();
// var criterionList = await _dictionaryRepository.Where(x => x.ParentId == dictionaryParentId && !useSystemQuestionCriterionIds.Contains(x.Id))
// .Select(x => new CriterionList()
// {
// Id = x.Id,
// Value = x.Value,
// ShowOrder=x.ShowOrder,
// }).ToListAsync();
// List<ReadingQuestionCriterionSystem> needAddCriterionList = new List<ReadingQuestionCriterionSystem>();
// criterionList.ForEach(x =>
// {
// needAddCriterionList.Add(new ReadingQuestionCriterionSystem()
// {
// CriterionId = x.Id,
// ShowOrder=x.ShowOrder,
// CriterionName = x.Value,
// IsEnable = false,
// });
// });
// await _readingQuestionCriterionSystemRepository.AddRangeAsync(needAddCriterionList);
// await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
//}
///// <summary> ///// <summary>
///// 删除系统问题标准 ///// 删除系统问题标准

5
IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
View File

@ -14,11 +14,6 @@ namespace IRaCIS.Core.Domain.Models
[Table("ReadingQuestionCriterionSystem")] [Table("ReadingQuestionCriterionSystem")]
public class ReadingQuestionCriterionSystem : Entity, IAuditAdd public class ReadingQuestionCriterionSystem : Entity, IAuditAdd
{ {
/// <summary>
/// 标准ID
/// </summary>
public Guid CriterionId { get; set; }
/// <summary> /// <summary>
/// 标准 /// 标准
/// </summary> /// </summary>