From a514330db3cf03b23ef6b9c7a4b4ef8c3660e2a8 Mon Sep 17 00:00:00 2001
From: wangxianl <ab785390847@163.com>
Date: 星期五, 18 十二月 2020 15:47:07 +0800
Subject: [PATCH] 修复export与list结果不统一的问题

---
 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 8fd3914..6f52b70 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -2,9 +2,14 @@
 
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.commons.lang3.StringUtils;
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
+
+import java.util.List;
 
 /**
  * ${functionName}Service涓氬姟灞傚鐞�
@@ -15,4 +20,90 @@
 @Service
 public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
 
+    @Override
+    public List<${ClassName}> queryList(${ClassName} ${className}) {
+        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
+#foreach($column in $columns)
+#set($queryType=$column.queryType)
+#set($javaField=$column.javaField)
+#set($javaType=$column.javaType)
+#set($columnName=$column.columnName)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if($column.query)
+#if($column.queryType == "EQ")
+#if($javaType == 'String') 
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else 
+        if (${className}.get$AttrName() != null){
+            lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end
+#elseif($queryType == "NE")
+#if($javaType == 'String') 
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else 
+        if (${className}.get$AttrName() != null){
+            lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end 
+#elseif($queryType == "GT")
+#if($javaType == 'String') 
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else 
+        if (${className}.get$AttrName() != null){
+            lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end
+#elseif($queryType == "GTE")
+#if($javaType == 'String') 
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else 
+        if (${className}.get$AttrName() != null){
+            lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end
+#elseif($queryType == "LT")
+#if($javaType == 'String') 
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else 
+        if (${className}.get$AttrName() != null){
+            lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end
+#elseif($queryType == "LTE")
+#if($javaType == 'String')
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else
+        if (${className}.get$AttrName() != null){
+            lqw.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end
+#elseif($queryType == "LIKE")
+#if($javaType == 'String')
+        if (StringUtils.isNotBlank(${className}.get$AttrName())){
+            lqw.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#else
+        if (${className}.get$AttrName() != null){
+            lqw.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
+        }
+#end
+#elseif($queryType == "BETWEEN")
+#end
+#end
+#end
+        return this.list(lqw);
+    }
 }

--
Gitblit v1.9.3