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

修改

Test_IRC_Net8
he 2025-06-10 09:13:48 +08:00
parent 5a83bf9221
commit 04aa2c79f6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -350,6 +350,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public class GetDataInspectionOutDto : DataInspection public class GetDataInspectionOutDto : DataInspection
{ {
public bool IsShow { get; set; } public bool IsShow { get; set; }
public string TrialReadingCriterionName { get; set; } public string TrialReadingCriterionName { get; set; }
public string BlindName { get; set; } public string BlindName { get; set; }
@ -461,6 +462,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
{ {
public Guid? FrontAuditConfigId { get; set; }
/// <summary> /// <summary>
/// 项目iD /// 项目iD
/// </summary> /// </summary>

8
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -8,7 +8,6 @@ using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infra.EFCore.Common;
using MassTransit; using MassTransit;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
@ -16,8 +15,6 @@ using Microsoft.Data.SqlClient;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Npgsql; using Npgsql;
using NPOI.POIFS.Properties;
using NPOI.SS.Formula.Functions;
namespace IRaCIS.Core.Application.Service namespace IRaCIS.Core.Application.Service
{ {
@ -1198,7 +1195,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId,Guid trialId) public async Task<object> GetModuleTypeDescriptionLiset(Guid moduleTypeId,Guid trialId)
{ {
@ -1208,10 +1205,11 @@ namespace IRaCIS.Core.Application.Service
select new select new
{ {
IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow, IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow,
FrontAuditConfigId = data.Id,
Description = _userInfo.IsEn_Us ? data.Description : data.DescriptionCN Description = _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
}; };
return result.Where(x=>x.IsShow).Select(x=>x.Description).Distinct().ToList(); return result.Where(x=>x.IsShow).Distinct().ToList();
} }
/// <summary> /// <summary>

2
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -209,7 +209,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
//.Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime)) //.Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
.Where(x => x.TrialId == inQuery.TrialId) .Where(x => x.TrialId == inQuery.TrialId)
.Where(x => x.IsShow) .Where(x => x.IsShow)
.WhereIf(inQuery.FrontAuditConfigId != null, x => x.FrontAuditConfigId == inQuery.FrontAuditConfigId)
#region 废弃 #region 废弃
// .WhereIf(dto.BatchId != null && dto.ObjectRelationParentId == null && dto.GeneralId == null, x => x.BatchId == dto.BatchId) // .WhereIf(dto.BatchId != null && dto.ObjectRelationParentId == null && dto.GeneralId == null, x => x.BatchId == dto.BatchId)
// .WhereIf(dto.BatchId != null && dto.GeneralId != null && dto.ObjectRelationParentId == null, x => x.BatchId == dto.BatchId || // .WhereIf(dto.BatchId != null && dto.GeneralId != null && dto.ObjectRelationParentId == null, x => x.BatchId == dto.BatchId ||