Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

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

@@ -638,6 +638,11 @@
             <param name="_trialRepository"></param>
             <returns></returns>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.InternationalizationService">
+            <summary>
+            InternationalizationService
+            </summary>	
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService">
             <summary>
             TrialEmailNoticeConfigService
@@ -7373,6 +7378,15 @@
             是否为特殊类型
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.InternationalizationView">
+            <summary> InternationalizationView  列表视图模型 </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.InternationalizationQuery">
+            <summary>InternationalizationQuery  列表查询参数模型</summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.InternationalizationAddOrEdit">
+            <summary> InternationalizationAddOrEdit  列表查询参数模型</summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigView">
             <summary> TrialEmailNoticeConfigView  列表视图模型 </summary>
         </member>
@@ -8223,6 +8237,11 @@
             IFrontAuditConfigService
             </summary>	
         </member>
+        <member name="T:IRaCIS.Core.Application.Interfaces.IInternationalizationService">
+            <summary>
+            IInternationalizationService
+            </summary>	
+        </member>
         <member name="T:IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService">
             <summary>
             ITrialEmailNoticeConfigService

IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs

@@ -0,0 +1,55 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:38:20 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel
+{
+    /// <summary> InternationalizationView  列表视图模型 </summary>
+    public class InternationalizationView
+    {
+        public Guid Id { get; set; }
+        public int ShowOrder { get; set; }
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public DateTime UpdateTime { get; set; }
+        public Guid UpdateUserId { get; set; }
+        public int State { get; set; }
+        public string FolderPath { get; set; }
+        public string Code { get; set; }
+        public string Value { get; set; }
+        public string ValueCN { get; set; }
+    }
+
+    ///<summary>InternationalizationQuery  列表查询参数模型</summary>
+    public class InternationalizationQuery:PageInput
+    {
+       
+        public string? FolderPath { get; set; }   
+        public string? Code { get; set; }     
+        public string? Value { get; set; }
+
+        public string? ValueCN { get; set; }
+
+    }
+
+    ///<summary> InternationalizationAddOrEdit  列表查询参数模型</summary>
+    public class InternationalizationAddOrEdit
+    {
+        public Guid? Id { get; set; }
+        public int State { get; set; }
+        public string FolderPath { get; set; }
+        public string Code { get; set; }
+        public string Value { get; set; }
+        public string ValueCN { get; set; }
+
+        public int InternationalizationType { get; set; }
+    }
+
+
+}
+
+

IRaCIS.Core.Application/Service/Common/Interface/IInternationalizationService.cs

@@ -0,0 +1,24 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:38:06 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Interfaces
+{
+    /// <summary>
+    /// IInternationalizationService
+    /// </summary>	
+    public interface IInternationalizationService
+    {
+
+        Task<PageOutput<InternationalizationView>> GetInternationalizationList(InternationalizationQuery inQuery);
+
+        Task<IResponseOutput> AddOrUpdateInternationalization(InternationalizationAddOrEdit addOrEditInternationalization);
+
+        Task<IResponseOutput> DeleteInternationalization(Guid internationalizationId);
+
+
+    }
+}

IRaCIS.Core.Application/Service/Common/InternationalizationService.cs

@@ -0,0 +1,71 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:42:25 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Service
+{
+    /// <summary>
+    /// InternationalizationService
+    /// </summary>	
+    [ApiExplorerSettings(GroupName = "Common")]
+    public class InternationalizationService : BaseService, IInternationalizationService
+    {
+
+        private readonly IRepository<Internationalization> _internationalizationRepository;
+
+        public InternationalizationService(IRepository<Internationalization> internationalizationRepository)
+        {
+            _internationalizationRepository = internationalizationRepository;
+        }
+
+        public async Task<PageOutput<InternationalizationView>> GetInternationalizationList(InternationalizationQuery inQuery)
+        {
+
+            var internationalizationQueryable =_internationalizationRepository
+                .WhereIf(inQuery.FolderPath!=null,t=>t.FolderPath.Contains(inQuery.FolderPath))
+                  .WhereIf(inQuery.Code != null, t => t.FolderPath.Contains(inQuery.Code))
+                    .WhereIf(inQuery.Value != null, t => t.FolderPath.Contains(inQuery.Value))
+                      .WhereIf(inQuery.ValueCN != null, t => t.FolderPath.Contains(inQuery.ValueCN))
+             .ProjectTo<InternationalizationView>(_mapper.ConfigurationProvider);
+
+            var pageList = await internationalizationQueryable
+            .ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? "Id" : inQuery.SortField,
+            inQuery.Asc);
+
+            return pageList;
+        }
+
+
+        public async Task<IResponseOutput> AddOrUpdateInternationalization(InternationalizationAddOrEdit addOrEditInternationalization)
+        {
+            var verifyExp1 = new EntityVerifyExp<Internationalization>()
+            {
+                VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType,
+
+                VerifyMsg = $"该类型已有{addOrEditInternationalization.Code}名称的国际化标识",
+                IsVerify = true
+            };
+
+            var entity = await _internationalizationRepository.InsertOrUpdateAsync(addOrEditInternationalization, true,verifyExp1);
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+        }
+
+
+        [HttpDelete("{internationalizationId:guid}")]
+        public async Task<IResponseOutput> DeleteInternationalization(Guid internationalizationId)
+        {
+            var success = await _internationalizationRepository.DeleteFromQueryAsync(t => t.Id == internationalizationId, true);
+            return ResponseOutput.Ok();
+        }
+
+
+    }
+}

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -54,6 +54,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<CommonDocument, CommonDocumentAddOrEdit>().ReverseMap();
 
+            CreateMap<Internationalization, InternationalizationView>();
+            CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
+
 
         }
     }

IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs

@@ -161,6 +161,10 @@ namespace IRaCIS.Application.Services
                     u.OptTime = opt.OptTime;
                     u.OptUserName = opt.OptUserName;
                 }
+                else
+                {
+                    u.DoctorTrialState = param.IntoGroupSearchState == 1 ? (int)EnrollStatus.HasDownloadResume : (int)EnrollStatus.HasCommittedToCRO;
+                }
             });
 
             if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM)

IRaCIS.Core.Domain.Share/Trial/EnrollStatus.cs

@@ -10,6 +10,8 @@
 
         HasAuditPassDownload = 3,//下载简历审核 同意
 
+
+
         HasDownloadResume = 4,    // 下载简历  完成
 
         HasCommittedToCRO = 5,        //已提交CRO

IRaCIS.Core.Domain/Common/Internationalization.cs

@@ -0,0 +1,48 @@
+
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:37:10 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+	 ///<summary>
+	 ///Internationalization
+	 ///</summary>
+	 [Table("Internationalization")]	
+	 public class Internationalization : Entity, IAuditUpdate, IAuditAdd
+	 {	 
+		public int ShowOrder { get; set; }
+	
+
+		public Guid CreateUserId { get; set; }
+	
+
+		public DateTime CreateTime { get; set; }
+	
+
+		public DateTime UpdateTime { get; set; }
+	
+
+		public Guid UpdateUserId { get; set; }
+	
+
+		public int State { get; set; }
+	
+
+		public string FolderPath { get; set; }
+
+		public string Code { get; set; }
+
+		public string Value { get; set; }
+
+		public string ValueCN { get; set; }
+
+        public int InternationalizationType { get; set; }
+
+    }
+
+}	 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -696,6 +696,9 @@ namespace IRaCIS.Core.Infra.EFCore
         public virtual DbSet<TrialEmailNoticeUser> TrialEmailNoticeUser { get; set; }
 
 
+        public virtual DbSet<Internationalization> Internationalization { get; set; }
+
+
     }
 
     public class MySequentialGuidValueGenerator : ValueGenerator<Guid>

IRaCIS.Core.Test/DbHelper.ttinclude

@@ -4,7 +4,7 @@
         public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
         public static readonly string DbDatabase = "IRaCIS_New_Tet";
         //表名称用字符串,拼接
-        public static readonly string TableName = "UserWLTemplate";
+        public static readonly string TableName = "Internationalization";
         //具体文件里面  例如service 可以配置是否分页
 	}
 #>

IRaCIS.Core.Test/TT_Template/IRaCIS .Core.IServiceAsync.tt

@@ -18,7 +18,7 @@
 //在这里设置 isPage 是否生成分页的还是不分页
 
 <# 
-	var isPage=false;
+	var isPage=true;
  #>
 
 <# 

IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt

@@ -20,7 +20,7 @@
 //在这里设置 isPage 是否生成分页的还是不分页
 
 <# 
-	var isPage=false;
+	var isPage=true;
  #>
 
 <# 
@@ -73,9 +73,9 @@ namespace IRaCIS.Core.Application.Service
 			    _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository
 			  .ProjectTo<<#=tableName#>View>(_mapper.ConfigurationProvider);
 
-                var pageList= await <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable.
+                var pageList= await <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable
-				.ToPagedListAsync(query<#=tableName#>.PageIndex, query<#=tableName#>.PageSize, string.IsNullOrWhiteSpace(query<#=tableName#>.SortField) ? "Id" : query<#=tableName#>.SortField,
+				.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? "Id" : inQuery.SortField,
-                hospitalSearchModel.Asc);
+                inQuery.Asc);
 
             return pageList;
 		}