From 0e59617691a54ddf30dee3bf3969e30e4767f619 Mon Sep 17 00:00:00 2001
From: hang <87227557@qq.com>
Date: Thu, 5 Sep 2024 23:35:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Test/IRaCIS.Core.Test.csproj      |  7 +++--
 .../{OK => Template}/EntityService.liquid     |  0
 .../Template/EntityViewModel.liquid           | 29 +++++++++----------
 .../{OK => Template}/IEntityService.liquid    |  9 ++----
 4 files changed, 21 insertions(+), 24 deletions(-)
 rename IRaCIS.Core.Test/{OK => Template}/EntityService.liquid (100%)
 rename IRaCIS.Core.Test/{OK => Template}/IEntityService.liquid (79%)

diff --git a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj
index 29c18a0ea..46a07fc5e 100644
--- a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj
+++ b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj
@@ -17,13 +17,13 @@
 
 
   <ItemGroup>
-    <None Update="OK\EntityService.liquid">
+    <None Update="Template\EntityService.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Template\EntityViewModel.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="OK\IEntityService.liquid">
+    <None Update="Template\IEntityService.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="TT_Template\IRaCIS .Core.ServiceAsync.tt">
@@ -72,6 +72,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="OK\" />
     <Folder Include="TT_Template\Dto_New\" />
     <Folder Include="TT_Template\IServices_New\" />
     <Folder Include="TT_Template\Models_New\" />
@@ -80,7 +81,7 @@
 	<Folder Include="TemplateOutPut\Entity\" />
 	<Folder Include="TemplateOutPut\IService\" />
 	<Folder Include="TemplateOutPut\Service\" />
-	<Folder Include="TemplateOutPut\DTO\" />
+	<Folder Include="TemplateOutPut\ViewModel\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IRaCIS.Core.Test/OK/EntityService.liquid b/IRaCIS.Core.Test/Template/EntityService.liquid
similarity index 100%
rename from IRaCIS.Core.Test/OK/EntityService.liquid
rename to IRaCIS.Core.Test/Template/EntityService.liquid
diff --git a/IRaCIS.Core.Test/Template/EntityViewModel.liquid b/IRaCIS.Core.Test/Template/EntityViewModel.liquid
index fa6acf051..1face3652 100644
--- a/IRaCIS.Core.Test/Template/EntityViewModel.liquid
+++ b/IRaCIS.Core.Test/Template/EntityViewModel.liquid
@@ -9,17 +9,16 @@ using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
 {
-
     public class {{ TableNameView }} : {{ TableNameAddOrEdit }}
     {
-        {% for field in ViewListFieldList %}
+         {% 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; }
@@ -27,19 +26,19 @@ 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.IsCSharpString  %}
-          public {{ field.CSharpType }}?  {{ field.FieldName }} { get; set; }
-         {% elsif field.IsNullable %}
-          public {{ field.CSharpType }} {{ field.FieldName }} { get; set; }
-          {% else %}
-           public {{ field.CSharpType }}?  {{ field.FieldName }} { get; set; }
+        {% if  field.IsNullable and field.IsCSharpString == false %}
+          public {{ field.CSharpType }}  {{ field.FieldName }} { get; set; }
+         {% else %}
+          public {{ field.CSharpType }}? {{ field.FieldName }} { get; set; }
          {% endif %}
         {%- endfor -%}
-      }
+    }
 }
 
+
+
diff --git a/IRaCIS.Core.Test/OK/IEntityService.liquid b/IRaCIS.Core.Test/Template/IEntityService.liquid
similarity index 79%
rename from IRaCIS.Core.Test/OK/IEntityService.liquid
rename to IRaCIS.Core.Test/Template/IEntityService.liquid
index 37c1016f9..7bd0beea6 100644
--- a/IRaCIS.Core.Test/OK/IEntityService.liquid
+++ b/IRaCIS.Core.Test/Template/IEntityService.liquid
@@ -6,17 +6,14 @@
 //--------------------------------------------------------------------
 using IRaCIS.Core.Application.ViewModel;
 namespace IRaCIS.Core.Application.Interfaces
-    {
-
+{
     public interface I{{TableName}}Service
     {
-
      {% if IsPaged %}
-          Task<PageOutput<<{{TableNameView}}>>  Get{{TableName}}List({{TableNameQuery}} inQuery);
+          Task<PageOutput<<{{TableNameView}}>> Get{{TableName}}List({{TableNameQuery}} inQuery);
      {% else %}
-		 Task<List<{{TableNameView}}>>  Get{{TableName}}List({{TableNameQuery}} inQuery);
+		 Task<List<{{TableNameView}}>> Get{{TableName}}List({{TableNameQuery}} inQuery);
      {% endif %}
-
          Task<IResponseOutput> AddOrUpdate{{TableName}}({{TableNameAddOrEdit}} addOrEdit{{TableName}});
 
          Task<IResponseOutput> Delete{{TableNameView}}(Guid {{LowercaseTableNameId}});