Browse Source

fix: excel import 关键字

冷冷 8 months ago
parent
commit
acda74821d
2 changed files with 4 additions and 4 deletions
  1. 2 2
      multiple/主子Contoller.java
  2. 2 2
      single/Controller.java

+ 2 - 2
multiple/主子Contoller.java

@@ -196,7 +196,7 @@ public class ${ClassName}Controller {
     #else
     #else
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     #end
     #end
-    public List<${ClassName}Entity> export(${ClassName}Entity ${className},${pk.attrType}[] ids) {
+    public List<${ClassName}Entity> exportExcel(${ClassName}Entity ${className},${pk.attrType}[] ids) {
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
     }
     }
 
 
@@ -212,7 +212,7 @@ public class ${ClassName}Controller {
     #else
     #else
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     #end
     #end
-    public R import(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
+    public R importExcel(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
         return R.ok(${className}Service.saveBatch(${className}List));
         return R.ok(${className}Service.saveBatch(${className}List));
     }
     }
 }
 }

+ 2 - 2
single/Controller.java

@@ -181,7 +181,7 @@ public class ${ClassName}Controller {
     #else
     #else
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     #end
     #end
-    public List<${ClassName}Entity> export(${ClassName}Entity ${className},${pk.attrType}[] ids) {
+    public List<${ClassName}Entity> exportExcel(${ClassName}Entity ${className},${pk.attrType}[] ids) {
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
     }
     }
 
 
@@ -197,7 +197,7 @@ public class ${ClassName}Controller {
     #else
     #else
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
     #end
     #end
-    public R import(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
+    public R importExcel(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
         return R.ok(${className}Service.saveBatch(${className}List));
         return R.ok(${className}Service.saveBatch(${className}List));
     }
     }
 }
 }