From 2b252d0b16df25cf13d4f397be7eb5693c09a0e5 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Wed, 13 Jul 2022 16:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxkj/generator/util/VelocityUtil.java | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
index 90fb7e34..b1165147 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
@@ -117,17 +117,17 @@ public class VelocityUtil {
     public static List<String> getTemplateList(String genTpl, List<GenTableColumn> columns) {
         List<String> templates = new LinkedList<>();
         templates.add("java/controller.java.vm");
-//        templates.add("java/entity.java.vm");
-//        templates.add("java/mapper.java.vm");
-//        templates.add("java/service.java.vm");
-//        templates.add("java/serviceImpl.java.vm");
-//        templates.add("java/validate.java.vm");
-//        if (VelocityUtil.getIsEqually(columns)) {
-//            templates.add("java/vo.java.vm");
-//        } else {
-//            templates.add("java/voList.java.vm");
-//            templates.add("java/voDetail.java.vm");
-//        }
+        templates.add("java/entity.java.vm");
+        templates.add("java/mapper.java.vm");
+        templates.add("java/service.java.vm");
+        templates.add("java/serviceImpl.java.vm");
+        templates.add("java/validate.java.vm");
+        if (VelocityUtil.getIsEqually(columns)) {
+            templates.add("java/vo.java.vm");
+        } else {
+            templates.add("java/voList.java.vm");
+            templates.add("java/voDetail.java.vm");
+        }
 //        if (GenConstants.TPL_CRUD.equals(genTpl)) {
 //            templates.add("vue/index.vue.vm");
 //        }
@@ -173,6 +173,14 @@ public class VelocityUtil {
             fileName = StringUtil.format("{}/vo/{}/{}Vo.java", GenConfig.adminPackage, moduleName, entityName);
         }
 
+        else if (template.contains("voList.java.vm")) {
+            fileName = StringUtil.format("{}/vo/{}/{}ListVo.java", GenConfig.adminPackage, moduleName, entityName);
+        }
+
+        else if (template.contains("voDetail.java.vm")) {
+            fileName = StringUtil.format("{}/vo/{}/{}DetailVo.java", GenConfig.adminPackage, moduleName, entityName);
+        }
+
         return fileName;
     }