代码生成器，增加 businessPackage 字段，用于将多个模块进行归类

src/main/resources/codegen/java/controller/controller.vm

@@ -73,4 +73,6 @@ public class ${table.className}Controller {
         return success(${table.className}Convert.INSTANCE.convertPage(pageResult));
     }
 
+
+
 }

src/main/resources/codegen/java/controller/vo/excelReqVO.vm

@@ -0,0 +1,42 @@
+package ${basePackage}.${table.moduleName}.controller.${table.businessName}.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import ${PageParamClassName};
+## 处理 Date 字段的引入
+#foreach ($column in $columns)
+    #if (${column.listOperation} && ${column.javaType} == "Date")## 时间类型
+		import org.springframework.format.annotation.DateTimeFormat;
+
+		import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+        #break
+    #end
+#end
+## 字段模板
+#macro(columnTpl $prefix $prefixStr)
+    #if (${column.javaType} == "Date")## 时间类型
+		@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    #end
+@ApiModelProperty(value = "${prefixStr}${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end)
+private ${column.javaType}#if ("$!prefix" != "") ${prefix}${JavaField}#else ${column.javaField}#end;
+#end
+
+@ApiModel(value = "${table.classComment} Excel 导出 Request VO", description = "参数和 ${table.className}PageReqVO 是一致的")
+@Data
+public class ${table.className}ExcelReqVO {
+
+#foreach ($column in $columns)
+    #set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写
+    #if (${column.listOperation})##查询操作
+        #if (${column.listOperationCondition} == "BETWEEN")## 情况一，Between 的时候
+            #columnTpl('begin', '开始')
+
+            #columnTpl('end', '结束')
+        #else##情况二，非 Between 的时间
+            #columnTpl('', '')
+        #end
+
+    #end
+#end
+}

src/main/resources/codegen/java/dal/do.vm

@@ -22,17 +22,15 @@ public class ${table.className}DO extends BaseDO {
 #foreach ($column in $columns)
 #if (!${baseDOFields.contains(${column.javaField})})##排除 BaseDO 的字段
     /**
-    * ${column.columnComment}
-    */
-#if ("$!column.dictType" != "")##处理枚举值
-    // TODO 枚举 ${column.dictType}
-#end
-#if (${column.primaryKey} && ${column.javaType} != 'String')##处理主键 + 非 String 的情况
-    @TableId
-#end
-#if (${column.primaryKey} && ${column.javaType} == 'String')##处理主键 + String 的情况
-    @TableId(type = IdType.INPUT)
-#end
+     * ${column.columnComment}
+    #if ("$!column.dictType" != "")##处理枚举值
+     *
+     * 枚举 {@link TODO ${column.dictType} 对应的类}
+    #end
+     */
+    #if (${column.primaryKey})##处理主键
+    @TableId#if (${column.javaType} == 'String')type = IdType.INPUT)#end
+    #end
     private ${column.javaType} ${column.javaField};
 #end
 #end

src/main/resources/codegen/vue/api/api.js.vm

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询${functionName}列表
+export function list${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询${functionName}详细
+export function get${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'get'
+  })
+}
+
+// 新增${functionName}
+export function add${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改${functionName}
+export function update${BusinessName}(data) {
+  return request({
+    url: '/${moduleName}/${businessName}',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除${functionName}
+export function del${BusinessName}(${pkColumn.javaField}) {
+  return request({
+    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+    method: 'delete'
+  })
+}
+
+// 导出${functionName}
+export function export${BusinessName}(query) {
+  return request({
+    url: '/${moduleName}/${businessName}/export',
+    method: 'get',
+    params: query
+  })
+}

src/main/resources/codegen/vue/views/index.vue.vm

@@ -9,8 +9,6 @@
     #set ($javaField = $column.javaField)
     #set ($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
     #set ($comment=$column.columnComment)
-    #set ($parentheseIndex=$column.columnComment.indexOf("（"))
-    #if ($parentheseIndex >= 0) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) #end
 #if ($column.htmlType == "input")
       <el-form-item label="${comment}" prop="${javaField}">
         <el-input v-model="queryParams.${javaField}" placeholder="请输入${comment}" clearable size="small" @keyup.enter.native="handleQuery"/>
@@ -67,8 +65,6 @@
     #set ($javaField = $column.javaField)
     #set ($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
     #set ($comment=$column.columnComment)
-    #set ($parentheseIndex=$column.columnComment.indexOf("（"))
-    #if ($parentheseIndex >= 0) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) #end
 #if ($column.javaType == "Date")## 时间类型
       <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
         <template slot-scope="scope">
@@ -108,8 +104,6 @@
     #set ($javaField = $column.javaField)
     #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
     #set ($comment = $column.columnComment)
-    #set ($parentheseIndex = $column.columnComment.indexOf("（"))
-    #if ($parentheseIndex >= 0) #set($comment = $column.columnComment.substring(0, $parentheseIndex)) #end
 #if ($column.htmlType == "input")
   #if (!$column.primaryKey)## 忽略主键，不用在表单里
         <el-form-item label="${comment}" prop="${javaField}">