修改token 名字

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -13130,6 +13130,14 @@
             <param name="_trialIdentityUserRepository"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.ExternalTrialUser(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialExternalUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole})">
+            <summary>
+            外部人员 中心调研人员维护
+            </summary>
+            <param name="_trialIdentityUserRepository"></param>
+            <param name="_trialUserRoleReposiotry"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.TestService.ModifyClinicalDataTable">
             <summary>
             维护临床数据  --一定要在同步表前同步数据才行

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -12,6 +12,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
     public class InspectionService(IRepository<DataInspection> _dataInspectionRepository,
         IRepository<Dictionary> _dictionaryRepository,
         IRepository<TrialSign> _trialSignRepository,
+        IRepository<IdentityUser> _identityUserRepository,
         IRepository<UserRole> _userRoleRepository,
         IRepository<TrialSite> _trialSiteRepository,
         IRepository<Trial> _trialRepository,
@@ -257,7 +258,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
         /// <summary> 验证用户签名信息 </summary> ///  
         public async Task<IResponseOutput> VerifySignatureAsync(SignDTO signDTO)
         {
-            var user = await _userRoleRepository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord);
+            var user = await _identityUserRepository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord);
             if (user == null)
             {
                 throw new BusinessValidationFailedException(_localizer["User_CheckNameOrPw"]);

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -1095,9 +1095,9 @@ namespace IRaCIS.Core.Application.Service
                 IdentityUserId = t.IdentityUserId,
                 UserTypeEnum = t.UserTypeEnum,
                 UserTypeId = t.UserTypeId,
-                IsTestUser = t.IsTestUser,
+                IsTestUser = t.IdentityUser.IsTestUser,
-                IsZhiZhun = t.IsZhiZhun,
+                IsZhiZhun = t.IdentityUser.IsZhiZhun,
-                FullName = t.FullName,
+                FullName = t.IdentityUser.FullName,
                 PermissionStr = t.UserTypeRole.PermissionStr,
                 UserName = t.UserName,
                 UserTypeShortName = t.UserTypeRole.UserTypeShortName,

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs

@@ -110,7 +110,7 @@ namespace IRaCIS.Core.Application.Contracts
 
                         //$"该用户在系统中账户名为：{existSysUser.LastName + " / " + existSysUser.FirstName} ，与填写信息存在不一致项, 现将界面信息修改为与系统一致，可进行保存"
                         return ResponseOutput.NotOk(_localizer["TrialSiteUser_InconsistentInfo", existSysUser.UserTypeRole.UserTypeShortName, existSysUser.EMail, existSysUser.LastName + " / " + existSysUser.FirstName, existSysUser.Phone],
-                            new { Id = optEntity.Id, existSysUser.LastName, existSysUser.FirstName, existSysUser.Phone, existSysUser.IsTestUser, existSysUser.IsZhiZhun }, ApiResponseCodeEnum.NeedTips);
+                            new { Id = optEntity.Id, existSysUser.LastName, existSysUser.FirstName, existSysUser.Phone }, ApiResponseCodeEnum.NeedTips);
                     }
 
                 }

IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs

@@ -278,7 +278,7 @@ namespace IRaCIS.Core.Application.Service
 
                         await _trialUserRoleRepository.AddAsync(new TrialUserRole() { TrialId = trialId, TrialUserId = findTrialUser.Id, UserId = findUserRoleId, JoinTime = DateTime.Now });
 
-                        await _userRoleRepository.BatchUpdateNoTrackingAsync(t => t.IdentityUserId == userId, u => new UserRole() { Status = UserStateEnum.Enable });
+                        await _userRoleRepository.BatchUpdateNoTrackingAsync(t => t.IdentityUserId == userId, u => new UserRole() { IsUserRoleDisabled =false });
 
                         await _trialExternalUseRepository.BatchUpdateNoTrackingAsync(t => t.Id == userInfo.Id, u => new TrialExternalUser() { IsJoin = true });
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.Service
                   TrialUserRoleList = t.TrialUserRoleList.Select(ur => new TrialIdentityUserRoleDto()
                   {
                       Id = ur.Id,
-                      UserTypeShortName=ur.UserRole.UserTypeRole.UserTypeShortName,
+                      UserTypeShortName = ur.UserRole.UserTypeRole.UserTypeShortName,
                       IsDeleted = ur.IsDeleted,
                       CreateTime = ur.CreateTime,
                       UpdateTime = ur.UpdateTime
@@ -132,10 +132,10 @@ namespace IRaCIS.Core.Application.Service
             var query = _userRoleRepository.Where(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin)
 
                  //正式或者培训的项目  不能允许测试用户（必须正式用户）  同时必须是内部的用户
-                 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IsTestUser == false && t.IsZhiZhun)
+                 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IsTestUser == false && t.IdentityUser.IsZhiZhun)
 
                  //测试项目 可以加入 测试用户  或者内部正式用户
-                 .WhereIf(trialType == TrialType.NoneOfficial, t => t.IsTestUser == true || (t.IsTestUser == false && t.IsZhiZhun))
+                 .WhereIf(trialType == TrialType.NoneOfficial, t => t.IsTestUser == true || (t.IsTestUser == false && t.IdentityUser.IsZhiZhun))
                  .Where(t => userTypeEnums.Contains(t.UserTypeEnum))
                  .WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum)
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName))
@@ -144,14 +144,14 @@ namespace IRaCIS.Core.Application.Service
                  .Select(t => new TrialUserRoleScreeningDto()
                  {
                      Id = t.Id,
-                     TrialId=inQuery.TrialId,
+                     TrialId = inQuery.TrialId,
                      IdentityUserId = t.IdentityUserId,
                      EMail = t.IdentityUser.EMail,
                      FullName = t.IdentityUser.FullName,
                      OrganizationName = t.IdentityUser.OrganizationName,
                      Phone = t.IdentityUser.Phone,
                      UserName = t.IdentityUser.UserName,
-                     UserTypeShortName=t.UserTypeRole.UserTypeShortName,
+                     UserTypeShortName = t.UserTypeRole.UserTypeShortName,
                      IsSelect = t.UserRoleTrials.Any(t => t.TrialId == inQuery.TrialId),
                  });
 
@@ -213,8 +213,8 @@ namespace IRaCIS.Core.Application.Service
             var query = _trialUseRoleRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
                 .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserRole.UserTypeEnum == UserTypeEnum.CRA)
                  .WhereIf(inQuery.UserTypeId != null, t => t.UserRole.UserTypeId == inQuery.UserTypeId)
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.UserRole.FullName).Contains(inQuery.UserRealName))
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.UserRole.IdentityUser.FullName).Contains(inQuery.UserRealName))
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.UserRole.OrganizationName.Contains(inQuery.OrganizationName))
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.UserRole.IdentityUser.OrganizationName.Contains(inQuery.OrganizationName))
                 .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider, new { trialSiteId = inQuery.TrialSiteId });
 
             return await query.ToPagedListAsync(inQuery);

IRaCIS.Core.Application/TestService.cs

@@ -26,6 +26,7 @@ using MiniExcelLibs;
 using NPOI.SS.Formula.Functions;
 using NPOI.XWPF.UserModel;
 using System.Globalization;
+using System.Reflection.Metadata.Ecma335;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -238,6 +239,34 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
+        /// <summary>
+        /// 外部人员 中心调研人员维护
+        /// </summary>
+        /// <param name="_trialIdentityUserRepository"></param>
+        /// <param name="_trialUserRoleReposiotry"></param>
+        /// <returns></returns>
+        [UnitOfWork]
+        public async Task<IResponseOutput> ExternalTrialUser(
+            [FromServices] IRepository<TrialSiteUserSurvey> _trialSiteUserSurveyRepository,
+            [FromServices] IRepository<TrialExternalUser> _trialExternalUserReposiotry,
+            [FromServices] IRepository<UserRole> _userRoleRepository)
+        {
+            var list = _userRoleRepository.Select(t => new { t.Id, t.IdentityUserId }).ToList();
+
+            foreach (var item in list.GroupBy(t => t.IdentityUserId))
+            {
+                var userRoleIdList = item.Select(t => t.Id).ToList();
+
+                var identityUserId = item.Key;
+
+                await _trialSiteUserSurveyRepository.BatchUpdateNoTrackingAsync(t => userRoleIdList.Contains(t.SystemUserId.Value), u => new TrialSiteUserSurvey() { SystemUserId = identityUserId });
+
+                await _trialExternalUserReposiotry.BatchUpdateNoTrackingAsync(t => userRoleIdList.Contains(t.SystemUserId), u => new TrialExternalUser() { SystemUserId = identityUserId });
+
+            }
+
+            return ResponseOutput.Ok();
+        }
 
 
         [LowerCamelCaseJson]

IRaCIS.Core.Domain/Management/User.cs

@@ -32,19 +32,22 @@ public class UserRole : BaseFullAuditEntity
 
     #endregion
 
-    #region 用户信息
+    public string UserName { get; set; }
+    public string EMail { get; set; }
+    public string FirstName { get; set; }
+
+    public string LastName { get; set; }
+
+    #region 后续删除用户信息
 
     public int Code { get; set; }
     public string UserCode { get; set; }
-    public string UserName { get; set; }
+  
-    public string EMail { get; set; }
 
     [StringLength(1000)]
     public string EmailToken { get; set; }
 
-    public string FirstName { get; set; }
    
-    public string LastName { get; set; }
 
     public string Password { get; set; }
 
@@ -82,6 +85,9 @@ public class UserRole : BaseFullAuditEntity
 
     public DateTime? LastLoginTime { get; set; }
 
+    [Comment("后续删除")]
+    public bool SuperAdmin { get; set; }
+
 
     #endregion
 
@@ -96,10 +102,6 @@ public class UserRole : BaseFullAuditEntity
 
     #region ÐÂÔö×Ö¶Î
 
-    [Comment("后续删除")]
-    public bool SuperAdmin { get; set; }
-
-
     public Guid IdentityUserId { get; set; }
 
     public bool IsUserRoleDisabled { get; set; }

IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs

@@ -27,6 +27,7 @@ public class TrialSiteUserSurvey : BaseFullAuditEntity
 
     public string OrganizationName { get; set; } = string.Empty;
 
+    [Comment("IdentityUser 表的用户Id")]
     public Guid? SystemUserId { get; set; }
 
     public bool IsGenerateAccount { get; set; }

IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs

@@ -21,6 +21,8 @@ public class TrialExternalUser : BaseFullAuditEntity
     public string LastName { get; set; } = String.Empty;
     public string OrganizationName { get; set; } = String.Empty;
     public bool IsSystemUser { get; set; }
+
+    [Comment("IdentityUser 表的用户Id")]
     public Guid SystemUserId { get; set; }
     public bool IsJoin { get; set; }
     public DateTime? ExpireTime { get; set; }