Просмотр исходного кода

修复启用驼峰转下划线的时候,按时间范围查询会错误,完善前端时间范围默认参数。

npc6 2 лет назад
Родитель
Сommit
245cb252f9

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm

@@ -47,7 +47,7 @@ if (@column.ColumnKey != "True"){
         @:/// <summary>
         @: /// @(@column.ColumnComment)范围
         @: /// </summary>
-        @: public List<DateTime?> @(@column.PropertyName)Range { get; set; } 
+        @: public DateTime?[] @(@column.PropertyName)Range { get; set; } 
 
 }
 

+ 1 - 16
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -56,6 +56,7 @@ if (@column.QueryWhether == "Y"){
     }else if(@column.NetType?.TrimEnd('?') == "int" || @column.NetType?.TrimEnd('?') == "long"){
             @:.WhereIF(input.@column.PropertyName>0, u => u.@(@column.PropertyName) @column.QueryType input.@(@column.PropertyName))
     }else if(@column.NetType?.TrimEnd('?') == "DateTime" && @column.QueryType == "~"){
+            @:.WhereIF(input.@(@column.PropertyName)Range != null && input.@(@column.PropertyName)Range.Length == 2, u => u.@(@column.PropertyName) >= input.@(@column.PropertyName)Range[0] && u.@(@column.PropertyName) <= input.@(@column.PropertyName)Range[1])
     }else if(@column.NetType?.TrimEnd('?').EndsWith("Enum") == true) {
             @:.WhereIF(input.@(@column.PropertyName).HasValue, u => u.@(@column.PropertyName) @column.QueryType input.@(@column.PropertyName))
     }
@@ -98,22 +99,6 @@ if (@column.QueryWhether == "Y"){
 }
 } else {
             @:.Select<@(@Model.ClassName)Output>();
-}
-@foreach (var column in Model.TableField){
-if (@column.QueryWhether == "Y"){
-    if(@column.NetType?.TrimEnd('?') == "DateTime" && @column.QueryType == "~"){
-        @:if(input.@(@column.PropertyName)Range != null && input.@(@column.PropertyName)Range.Count >0)
-        @:{
-            @:DateTime? start= input.@(@column.PropertyName)Range[0]; 
-            @:query = query.WhereIF(start.HasValue, u => u.@column.PropertyName > start);
-            @:if (input.@(@column.PropertyName)Range.Count >1 && input.@(@column.PropertyName)Range[1].HasValue)
-            @:{
-                @:var end = input.@(@column.PropertyName)Range[1].Value.AddDays(1);
-                @:query = query.Where(u => u.@(@column.PropertyName) < end);
-            @:}
-        @:} 
-    }
-}
 }
         return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
     }

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -71,7 +71,7 @@
             }else if(@column.EffectType == "DatePicker"){
             @:<el-form-item label="@column.ColumnComment">
               if(@column.QueryType == "~"){
-              @:<el-date-picker placeholder="请选择@(@column.ColumnComment)" value-format="YYYY/MM/DD" type="daterange" v-model="queryParams.@(@column.LowerPropertyName)Range" />
+              @:<el-date-picker type="daterange" v-model="queryParams.@(@column.LowerPropertyName)Range"  value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" />
               }else
               {
               @:<el-date-picker placeholder="请选择@(@column.ColumnComment)" value-format="YYYY/MM/DD"  v-model="queryParams.@(@column.LowerPropertyName)" />