From ea038a5437d2073121d7be840c929e196180d263 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 30 Jul 2021 22:33:09 +0800
Subject: [PATCH] 优化代码生成模板
---
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
index 67d8e6c..62192bd 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
@@ -20,7 +20,7 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
-#if($table.crud)
+#if($table.crud || $table.sub)
import com.ruoyi.common.core.web.page.TableDataInfo;
#elseif($table.tree)
#end
@@ -43,7 +43,7 @@
*/
@PreAuthorize(hasPermi = "${permissionPrefix}:list")
@GetMapping("/list")
-#if($table.crud)
+#if($table.crud || $table.sub)
public TableDataInfo list(${ClassName} ${className})
{
startPage();
@@ -68,7 +68,7 @@
{
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
- util.exportExcel(response, list, "${businessName}");
+ util.exportExcel(response, list, "${functionName}数据");
}
/**
@@ -78,7 +78,7 @@
@GetMapping(value = "/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{
- return AjaxResult.success(${className}Service.select${ClassName}ById(${pkColumn.javaField}));
+ return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
}
/**
@@ -111,6 +111,6 @@
@DeleteMapping("/{${pkColumn.javaField}s}")
public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
{
- return toAjax(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s));
+ return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
}
}
--
Gitblit v1.9.3