From 67cca92a1bf16601d7d1f855ce8558ffa36c8c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sat, 26 Dec 2020 01:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=B8=BA=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=AF=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=A8=8B=E5=BA=8F=E5=88=A0=E5=87=8F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generate/core/param/TableField.java       |  2 +-
 .../service/impl/CodeGenerateServiceImpl.java |  6 ++-
 .../resources/template/ServiceImpl.java.vm    | 38 +++++++++++++------
 .../src/main/resources/template/index.vue.vm  |  4 --
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/param/TableField.java b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/param/TableField.java
index 47c7f0f4..f12e6044 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/param/TableField.java
+++ b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/param/TableField.java
@@ -32,7 +32,7 @@ public class TableField {
     public String columnKey;
 
     /**
-     * 主键（转换后的）
+     * 字段名，用来 get set方法使用的
      */
     public String columnKeyName;
 
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java
index 1db7d547..0e8ce91d 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java
+++ b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java
@@ -227,10 +227,12 @@ public class CodeGenerateServiceImpl extends ServiceImpl<CodeGenerateMapper, Cod
             BeanUtil.copyProperties(item, tableField);
             if (tableField.getColumnKey().equals(Config.DB_TABLE_COM_KRY)) {
                 tableField.setPrimaryKeyFlag(true);
-                String columnName = NamingConTool.UnderlineToHump(item.getColumnName(),"");
-                tableField.setColumnKeyName(columnName.substring(0,1).toUpperCase() + columnName.substring(1,columnName.length()));
             }
 
+            // 加入后端查询参数get set参数
+            String columnName = NamingConTool.UnderlineToHump(item.getColumnName(),"");
+            tableField.setColumnKeyName(columnName.substring(0,1).toUpperCase() + columnName.substring(1,columnName.length()));
+
             // 字段类型转换Java类型
             tableField.setJavaType(JavaSqlTool.sqlToJava(item.getDataType()));
 
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/ServiceImpl.java.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/ServiceImpl.java.vm
index ab0d1c19..9b632ed3 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/ServiceImpl.java.vm
+++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/ServiceImpl.java.vm
@@ -58,14 +58,22 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     public PageResult<${ClassName}> page(${ClassName}Param ${className}Param) {
         QueryWrapper<${ClassName}> queryWrapper = new QueryWrapper<>();
         if (ObjectUtil.isNotNull(${className}Param)) {
-    #foreach ($column in $tableField)
-        #if (${column.primaryKeyFlag})
-            // 根据条件 模糊查询
+
+#foreach ($column in $tableField)
+#if (${column.primaryKeyFlag})
+            // 根据${column.columnComment} 查询
+            if (ObjectUtil.isNotEmpty(${className}Param.get${column.columnKeyName}())) {
+                queryWrapper.lambda().eq(${ClassName}::get${column.columnKeyName}, ${className}Param.get${column.columnKeyName}());
+            }
+
+#else
+            // 根据${column.columnComment} 模糊查询
             if (ObjectUtil.isNotEmpty(${className}Param.get${column.columnKeyName}())) {
                 queryWrapper.lambda().like(${ClassName}::get${column.columnKeyName}, ${className}Param.get${column.columnKeyName}());
             }
-        #end
-    #end
+
+#end
+#end
         }
         return new PageResult<>(this.page(PageFactory.defaultPage(), queryWrapper));
     }
@@ -74,13 +82,21 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     public List<${ClassName}> list(${ClassName}Param ${className}Param) {
         LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>();
         if (ObjectUtil.isNotNull(${className}Param)) {
-            //根据条件模糊查询
+
 #foreach ($column in $tableField)
-    #if (${column.primaryKeyFlag})
-        if (ObjectUtil.isNotEmpty(${className}Param.get${column.columnKeyName}())) {
-            queryWrapper.eq(${ClassName}::get${column.columnKeyName}, ${className}Param.get${column.columnKeyName}());
-        }
-    #end
+#if (${column.primaryKeyFlag})
+            // 根据${column.columnComment} 查询
+            if (ObjectUtil.isNotEmpty(${className}Param.get${column.columnKeyName}())) {
+                queryWrapper.eq(${ClassName}::get${column.columnKeyName}, ${className}Param.get${column.columnKeyName}());
+            }
+
+#else
+            // 根据${column.columnComment} 模糊查询
+            if (ObjectUtil.isNotEmpty(${className}Param.get${column.columnKeyName}())) {
+                queryWrapper.like(${ClassName}::get${column.columnKeyName}, ${className}Param.get${column.columnKeyName}());
+            }
+
+#end
 #end
         }
         return this.list(queryWrapper);
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/index.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/index.vue.vm
index 689be7e4..259f7caa 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/index.vue.vm
+++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/index.vue.vm
@@ -4,15 +4,12 @@
       <a-form layout="inline">
         <a-row :gutter="48">
 #foreach ($column in $tableField)
-#if (${column.primaryKeyFlag})
           <a-col :md="8" :sm="24">
             <a-form-item label="${column.columnComment}" >
               <a-input v-model="queryParam.${column.columnName}" allow-clear placeholder="请输入${column.columnComment}"/>
             </a-form-item>
           </a-col>
 #end
-#end
-
           <a-col :md="!advanced && 8 || 24" :sm="24">
             <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
               <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -36,7 +33,6 @@
       :rowKey="(record) => record.${column.columnName}"
 #end
 #end
-
       :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
     >
       <span slot="action" slot-scope="text, record">