From a46bc9e7e8e0df9ed6ad097a0451d643e0176099 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 18 Sep 2023 13:47:07 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/java/controller.java.vm |  4 +++
 .../src/main/resources/vm/vue/index.vue.vm    | 25 +++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/aucma-generator/src/main/resources/vm/java/controller.java.vm b/aucma-generator/src/main/resources/vm/java/controller.java.vm
index 4ee93e9..feb94f8 100644
--- a/aucma-generator/src/main/resources/vm/java/controller.java.vm
+++ b/aucma-generator/src/main/resources/vm/java/controller.java.vm
@@ -83,6 +83,8 @@ public class ${ClassName}Controller extends BaseController {
     @Log(title = "${functionName}" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ${ClassName} ${className}) {
+        ${className}.setCreatedBy(getUsername());
+        ${className}.setCreatedTime(DateUtils.getNowDate());
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
@@ -93,6 +95,8 @@ public class ${ClassName}Controller extends BaseController {
     @Log(title = "${functionName}" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
+        ${className}.setUpdatedBy(getUsername());
+        ${className}.setUpdatedTime(DateUtils.getNowDate());
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 
diff --git a/aucma-generator/src/main/resources/vm/vue/index.vue.vm b/aucma-generator/src/main/resources/vm/vue/index.vue.vm
index 6296014..c949fe9 100644
--- a/aucma-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/aucma-generator/src/main/resources/vm/vue/index.vue.vm
@@ -110,7 +110,7 @@
           v-hasPermi="['${moduleName}:${businessName}:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
@@ -124,21 +124,21 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible"/>
 #elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180" v-if="columns[${foreach.index}].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
 #elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100" v-if="columns[${foreach.index}].visible">
         <template slot-scope="scope">
           <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
         </template>
       </el-table-column>
 #elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
+      <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible">
         <template slot-scope="scope">
 #if($column.htmlType == "checkbox")
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
@@ -148,7 +148,7 @@
         </template>
       </el-table-column>
 #elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible"/>
 #end
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -422,7 +422,18 @@ export default {
         ]#if($foreach.count != $columns.size()),#end
 #end
 #end
-      }
+      },
+      columns: [
+#foreach ($column in $columns)
+ #set($parentheseIndex=$column.columnComment.indexOf("（"))
+ #if($parentheseIndex != -1)
+        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+ #else
+        #set($comment=$column.columnComment)
+ #end
+            { key: ${foreach.index}, label: `${comment}`, visible: true },
+#end
+        ]
     };
   },
   created() {