From 329437411d18a202e07c9e6c3f1a85437f43e4cd Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 14 May 2024 14:38:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/DTO/UserLogViewModel.cs        |  2 ++
 .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs   | 11 +++++++++++
 .../Service/TrialSiteUser/TrialMaintenanceService.cs  | 10 ++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index 71f6de8ea..5f205ff5b 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? LoginUserId { get; set; }
 
         public Guid? OptUserId { get; set; }
+
+        public string IPRegion { get; set; }
     }
 
     ///<summary>UserLogQuery  列表查询参数模型</summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
index 07dca77ed..bf2769f68 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
@@ -55,6 +55,17 @@ namespace IRaCIS.Application.Contracts
         public string UserName { get; set; } = String.Empty;
     }
 
+    public class TrialUserBasicInfo
+    {
+        public Guid UserTypeId { get; set; }
+
+        public string UserName { get; set; }
+
+        public string FullName { get; set; }
+
+        public Guid UserId { get; set; }
+    }
+
     public class TrialMaintenanceDTO : UserTrialCommand
     {
         //[JsonIgnore]
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 314e578c2..1881baa25 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Service;
 using Microsoft.AspNetCore.Authorization;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Contracts;
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
 
 namespace IRaCIS.Application.Services
 {
@@ -61,8 +62,13 @@ namespace IRaCIS.Application.Services
         //}
         #endregion
 
-
-
+        [HttpGet]
+        public async Task<List<TrialUserBasicInfo>>  GetTrialUserList(Guid trialId)
+        {
+          return await  _trialUseRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
+                .Select(t => new TrialUserBasicInfo() { FullName = t.User.FullName, UserId = t.UserId, UserTypeId = t.User.UserTypeId, UserName = t.User.UserName })
+                .ToListAsync();
+        }
 
         /// <summary>
         /// Setting页面    获取项目参与人员列表