!863 fix(generator): 优化代码生成器模板和逻辑

* fix(generator): 优化代码生成器模板和逻辑

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java

@@ -168,6 +168,7 @@ public class TemplateEngineUtils {
         boolean needDigit = false;
         boolean needDateField = false;
         boolean needSwitchField = false;
+        boolean needParseTime = false;
         String firstTreeListField = StringUtils.EMPTY;
         for (GenTableColumn column : genTable.getColumns()) {
             boolean writable = column.isInsert() || column.isEdit();
@@ -183,6 +184,7 @@ public class TemplateEngineUtils {
             needDigit = needDigit || writable && StringUtils.equals(column.getHtmlType(), GenConstants.HTML_INPUT_NUMBER);
             needDateField = needDateField || writable && StringUtils.equals(column.getHtmlType(), GenConstants.HTML_DATETIME);
             needSwitchField = needSwitchField || (writable || column.isList()) && StringUtils.equals(column.getHtmlType(), GenConstants.HTML_SWITCH);
+            needParseTime = needParseTime || column.isList() && StringUtils.equals(column.getHtmlType(), GenConstants.HTML_DATETIME);
             if (StringUtils.isBlank(firstTreeListField) && column.isList()) {
                 firstTreeListField = column.getJavaField();
             }
@@ -202,6 +204,7 @@ public class TemplateEngineUtils {
         context.put("needDigit", needDigit);
         context.put("needDateField", needDateField);
         context.put("needSwitchField", needSwitchField);
+        context.put("needParseTime", needParseTime);
         context.put("firstTreeListField", firstTreeListField);
     }
 

ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/index.vue.ftl

@@ -60,7 +60,7 @@
                 placeholder="请选择${column.columnLabel}"
               />
             </el-form-item>
-<#elseif column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#elseif column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
             <el-form-item label="${column.columnLabel}" style="width: 308px">
               <el-date-picker
                 v-model="dateRange${column.capJavaField}"
@@ -233,7 +233,7 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
 <#list columns as column>
-<#if (column.insert || column.edit) && !column.pk>`n<#if column.htmlType == "input">
+<#if (column.insert || column.edit) && !column.pk><#if column.htmlType == "input">
         <el-form-item label="${column.columnLabel}" prop="${column.javaField}">
           <el-input v-model="form.${column.javaField}" placeholder="请输入${column.columnLabel}" />
         </el-form-item>
@@ -380,6 +380,9 @@ import { useTableSelection } from '@/hooks/table/useTableSelection';
 <#if needDict>
 import { useDict } from '@/utils/dict';
 </#if>
+<#if needParseTime>
+import { parseTime } from '@/utils/ruoyi';
+</#if>
 import modal from '@/plugins/modal';
 <#if enableExport>
 import { download as requestDownload } from '@/utils/request';
@@ -400,7 +403,7 @@ const { loading, withLoading } = useLoading(true);
 const { showSearch } = useSearchToggle();
 const total = ref(0);
 <#list columns as column>
-<#if column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#if column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
 const {
   dateRange: dateRange${column.capJavaField},
   applyDateRange: apply${column.capJavaField}DateRange,
@@ -472,7 +475,7 @@ const getList = async () => {
 <#if needAddDateRange>
     let params = queryParams.value;
 <#list columns as column>
-<#if column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#if column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
 params = apply${column.capJavaField}DateRange(params);
 </#if>
 </#list>
@@ -505,7 +508,7 @@ const { resetQuery } = useSearchReset({
   initialPageSize: 10,
   resetExtras: () => {
 <#list columns as column>
-<#if column.htmlType == "datetime" && column.queryType == "BETWEEN">
+<#if column.htmlType == "datetime" && column.queryType == "BETWEEN" && column.query>
 reset${column.capJavaField}DateRange();
 </#if>
 </#list>