修改代码模板

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

@@ -1371,7 +1371,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.GetDialogList(IRaCIS.Core.Infra.EFCore.Common.Dto.AccessToDialogueInDto)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.GetDialogList(IRaCIS.Core.Application.ViewModel.AccessToDialogueInDto)">
             <summary>
             获取查询对象
             </summary>
@@ -1384,7 +1384,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.CopyFrontAuditConfigItem(IRaCIS.Core.Infra.EFCore.Common.Dto.CopyFrontAuditConfigItemDto)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.CopyFrontAuditConfigItem(IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto)">
             <summary>
             复制配置项及其子项
             </summary>
@@ -1398,14 +1398,14 @@
             <param name="data">数据集</param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetInspectionEnumValue(IRaCIS.Core.Infra.EFCore.Common.Dto.SetInspectionEnumValueDto)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetInspectionEnumValue(IRaCIS.Core.Application.ViewModel.SetInspectionEnumValueDto)">
             <summary>
             翻译稽查数据
             </summary>
             <param name="dto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetInspectionEnumValueDataList(IRaCIS.Core.Infra.EFCore.Common.Dto.SetInspectionEnumValueDto,System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetInspectionEnumValueDataList(IRaCIS.Core.Application.ViewModel.SetInspectionEnumValueDto,System.Guid)">
             <summary>
             翻译稽查数据
             </summary>
@@ -10839,6 +10839,21 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemAnonymizationAddOrEdit">
             <summary> SystemAnonymizationAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
+            <summary>
+            质疑
+            </summary>
+        </member>
+        <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
+            <summary>
+            一致性核查
+            </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
+            <summary>
+            复制
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
             <summary> SystemNoticeView  列表视图模型 </summary>
         </member>

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -24,13 +24,13 @@ using MassTransit;
 using System.Reactive.Subjects;
 using Subject = IRaCIS.Core.Domain.Models.Subject;
 
-namespace IRaCIS.Core.Application.Service.Allocation
+namespace IRaCIS.Core.Application.Service.Allocation;
-{
+
-    /// <summary>
+/// <summary>
-    /// 访视读片任务
+/// 访视读片任务
-    /// </summary>	
+/// </summary>	
-    [ApiExplorerSettings(GroupName = "Trial")]
+[ApiExplorerSettings(GroupName = "Trial")]
-    public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
+public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<Trial> _trialRepository,
     IRepository<SubjectVisit> _subjectVisitRepository,
     IRepository<TaskAllocationRule> _taskAllocationRuleRepository,
@@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
     IRepository<TaskInfluence> _taskInfluenceRepository,
     IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
     IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository) : BaseService, IVisitTaskService
-    {
+{
 
 
 
@@ -3108,5 +3108,4 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
     #endregion
-    }
 }

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

@@ -7,7 +7,7 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using IRaCIS.Core.Infra.EFCore.Common.Dto;
+using IRaCIS.Core.Infra.EFCore.Common;
 
 namespace IRaCIS.Core.Application.ViewModel
 {

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionViewModel.cs

@@ -0,0 +1,73 @@
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+namespace IRaCIS.Core.Application.ViewModel;
+
+public class DateDto
+{
+    public string Code { get; set; }
+
+    public string DateType { get; set; }
+
+    public string Identification { get; set; }
+}
+
+public class SetInspectionEnumValueDto
+{
+    [NotDefault]
+    public Guid TrialId { get; set; }
+
+    [NotDefault]
+    public List<Guid> AuditDataIds { get; set; }
+
+
+
+}
+
+
+public class AccessToDialogueInDto
+{
+    public Guid Id { get; set; }
+
+    public AccessToDialogueEnum Type { get; set; }
+
+    public DateTime Createtime { get; set; }
+}
+
+
+public class AccessToDialogueOutDto
+{
+    public string CreateUserName { get; set; }
+
+    public string TalkContent { get; set; }
+
+    public DateTime CreateTime { get; set; }
+
+    public bool IsTitle { get; set; }
+}
+
+public enum AccessToDialogueEnum
+{
+    /// <summary>
+    /// ÖÊÒÉ
+    /// </summary>
+    Question = 0,
+
+    /// <summary>
+    /// Ò»ÖÂÐԺ˲é
+    /// </summary>
+    Consistency = 1,
+}
+
+/// <summary>
+/// ¸´ÖÆ
+/// </summary>
+public class CopyFrontAuditConfigItemDto
+{
+    public Guid ParentId { get; set; }
+
+    public Guid ChildId { get; set; }
+}
+
+
+
+

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

@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using MassTransit;
-using IRaCIS.Core.Infra.EFCore.Common.Dto;
 using Microsoft.Data.SqlClient;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -19,6 +18,7 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.EntityFrameworkCore;
 using Npgsql;
+using IRaCIS.Core.Infra.EFCore.Common;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -1,6 +1,5 @@
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore.Common.Dto;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
 using MassTransit;

IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs

@@ -7,20 +7,8 @@ using System.ComponentModel.DataAnnotations;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Infra.EFCore.Common.Dto
+namespace IRaCIS.Core.Infra.EFCore.Common
 {
-    public class SetInspectionEnumValueDto
-    {
-        [NotDefault]
-        public Guid TrialId { get; set; }
-
-        [NotDefault]
-        public List<Guid> AuditDataIds { get; set; }
-
-
-
-    }
-
     public class SetInspectionEnumDataDto
     {
         public Guid Id { get; set; }
@@ -34,8 +22,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
         public Guid? ObjectRelationParentId2 { get; set; }
 
         public Guid? ObjectRelationParentId3 { get; set; }
-
-
         /// <summary>
         /// 批次Id
         /// </summary>
@@ -46,56 +32,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
 
 
 
-
-    public class AddInterface
-    {
-        public Guid ParentId { get; set; }
-
-        public List<string> Names { get; set; }
-    }
-
-    public class AccessToDialogueInDto
-    {
-        public Guid Id { get; set; }
-
-        public AccessToDialogueEnum Type { get; set; }
-
-        public DateTime Createtime { get; set; }
-    }
-
-
-    public class AccessToDialogueOutDto
-    {
-        public string CreateUserName { get; set; }
-
-        public string TalkContent { get; set; }
-
-        public DateTime CreateTime { get; set; }
-
-        public bool IsTitle { get; set; }
-    }
-
-    public enum AccessToDialogueEnum
-    {
     /// <summary>
-        /// 质疑
+    /// 稽查数据
     /// </summary>
-        Question = 0,
+    public class InspectionJsonDetail
-
-        /// <summary>
-        /// 一致性核查
-        /// </summary>
-        Consistency = 1,
-    }
-
-    /// <summary>
-    /// 复制
-    /// </summary>
-    public class CopyFrontAuditConfigItemDto
     {
-        public Guid ParentId { get; set; }
+        public string EntityName { get; set; }
+        public object Data { get; set; }
 
-        public Guid ChildId { get; set; }
+        public object CommonData { get; set; }
     }
 
 
@@ -109,16 +54,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
         public string UnitName { get; set; }
     }
 
-    /// <summary>
-    /// 稽查数据
-    /// </summary>
-    public class InspectionJsonDetail
-    {
-        public string EntityName { get; set; }
-        public object Data { get; set; }
-
-        public object CommonData { get; set; }
-    }
 
     public class VisitTaskAuditingDto
     {
@@ -175,7 +110,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
         /// <summary>
         /// 标识操作  是否区分接口
         /// </summary>
-		public bool IsDistinctionInterface=true;
+        public bool IsDistinctionInterface = true;
 
         public bool IsSelfDefine = false;
 
@@ -195,9 +130,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
 		/// </summary>
         public Guid? TrialId { get; set; }
 
-        public Guid? TrialSiteId { get;set; }
+        public Guid? TrialSiteId { get; set; }
-
-
 
         /// <summary>
         /// 受试者
@@ -238,20 +171,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
         /// </summary>
         public string SubjectVisitName { get; set; }
 
-
-
-        //      /// <summary>
-        ///// 创建人名称
-        ///// </summary>
-        //public string CreateUserName { get; set; }
-
-
-        //      /// <summary>
-        //      /// 角色名称
-        //      /// </summary>
-        //      public string RoleName { get; set; }
-
-
     }
 
     public class SetInspectionEnum
@@ -268,9 +187,4 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
 
         public string Remake { get; set; }
     }
-
-
-
-
-
 }

IRaCIS.Core.Infra.EFCore/Common/Dto/DateDto.cs

@@ -1,23 +0,0 @@
-using IRaCIS.Core.Domain.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Infra.EFCore.Common.Dto
-{
-    public class DateDto
-    {
-        public string Code { get; set; }
-
-        public string DateType { get; set; }
-
-		public string Identification { get; set; }
-	}
-    public class ForeignKey
-    {
-        public string Text { get; set; }
-    }
-}

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

@@ -16,7 +16,6 @@ using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.ValueGeneration;
 using UserTypeGroup = IRaCIS.Core.Domain.Models.UserTypeGroup;
 using IRaCIS.Core.Infra.EFCore.Common;
-using IRaCIS.Core.Infra.EFCore.Common.Dto;
 using Microsoft.Identity.Client;
 using EntityFramework.Exceptions.Common;
 using System.Data;

IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid

@@ -11,12 +11,11 @@ using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infrastructure.Extention;
 using System.Threading.Tasks;
 using IRaCIS.Core.Infra.EFCore;
-namespace IRaCIS.Core.Application.Service
+namespace IRaCIS.Core.Application.Service;
-{	
 	
-	[ ApiExplorerSettings(GroupName = "Test")]
+[ ApiExplorerSettings(GroupName = "Test")]
-	public class {{TableName}}Service(IRepository<{{TableName}}> {{LowercaseRepositoryName}}): BaseService, I{{TableName}}Service
+public class {{TableName}}Service(IRepository<{{TableName}}> {{LowercaseRepositoryName}}): BaseService, I{{TableName}}Service
-    {
+{
 
 	{% if IsPaged %}
 	[HttpPost]
@@ -66,7 +65,7 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
 	}
       
-       
-    }
 }
 
+
+

IRaCIS.Core.Test/LiquidTemplate/EntityViewModel.liquid

@@ -7,18 +7,18 @@
 using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
-namespace IRaCIS.Core.Application.ViewModel
+namespace IRaCIS.Core.Application.ViewModel;
+
+public class {{ TableNameView }} : {{ TableNameAddOrEdit }}
 {
-    public class {{ TableNameView }} : {{ TableNameAddOrEdit }}
-    {
         {% for field in ViewListFieldList %}
         public {{ field.CSharpType }} {{ field.FieldName }} { get; set; }
     {% endfor %}
-    }
+}
 
 
-    public class {{ TableNameAddOrEdit }}
+public class {{ TableNameAddOrEdit }}
-    {
+{
     {%- for field in AddOrUpdateFieldList -%}
         {% if  field.IsPrimarykey  %}
         public {{ field.CSharpType }}? {{ field.FieldName }} { get; set; }
@@ -26,10 +26,10 @@ namespace IRaCIS.Core.Application.ViewModel
         public {{ field.CSharpType }} {{ field.FieldName }} { get; set; }
         {% endif %}
     {%- endfor -%}
-    }
+}
 
-    public class {{ TableNameQuery }}
+public class {{ TableNameQuery }}
-    {
+{
     {%- for field in QueryListFieldList -%}
     {% if  field.IsNullable and field.IsCSharpString == false %}
         public {{ field.CSharpType }}  {{ field.FieldName }} { get; set; }
@@ -37,8 +37,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public {{ field.CSharpType }}? {{ field.FieldName }} { get; set; }
         {% endif %}
     {%- endfor -%}
-    }
 }
 
 
 
+

IRaCIS.Core.Test/LiquidTemplate/IEntityService.liquid

@@ -8,10 +8,10 @@ using System;
 using IRaCIS.Core.Infrastructure.Extention;
 using System.Threading.Tasks;
 using IRaCIS.Core.Application.ViewModel;
-namespace IRaCIS.Core.Application.Interfaces
+namespace IRaCIS.Core.Application.Interfaces;
+
+public interface I{{TableName}}Service
 {
-    public interface I{{TableName}}Service
-    {
     {% if IsPaged %}
         Task<PageOutput<<{{TableNameView}}>> Get{{TableName}}List({{TableNameQuery}} inQuery);
     {% else %}
@@ -20,6 +20,6 @@ namespace IRaCIS.Core.Application.Interfaces
         Task<IResponseOutput> AddOrUpdate{{TableName}}({{TableNameAddOrEdit}} addOrEdit{{TableName}});
 
         Task<IResponseOutput> Delete{{TableNameView}}(Guid {{LowercaseTableNameId}});
-    }
 }
 
+