From 5204bcfb515e9b78ab3677b7933973d3d3df77b3 Mon Sep 17 00:00:00 2001
From: wangbing <wangbingit@outlook.com>
Date: Tue, 7 May 2019 17:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SpringBoot/java/ent/entity.ftl    |  5 ++--
 .../java/frame/base/BaseFindRequest.java      | 28 -------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/ent/entity.ftl b/src/main/resources/modules/SpringBoot/java/ent/entity.ftl
index 5e594886..93214e86 100644
--- a/src/main/resources/modules/SpringBoot/java/ent/entity.ftl
+++ b/src/main/resources/modules/SpringBoot/java/ent/entity.ftl
@@ -31,11 +31,11 @@ public class ${table.getCName()} extends BaseEntity {
      * ${field.fieldName} - ${field.fieldComment?default("")}
      */
     private ${field.fieldType.javaType()} ${field.getFName()};
-
 </#if>
 </#list>
 <#list table.fields as field>
 <#if field.fieldType.javaType() == "Enum">
+
     public ${field.getCName()} ${field.getterName()}() {
         return this.${field.getFName()};
     }
@@ -43,8 +43,8 @@ public class ${table.getCName()} extends BaseEntity {
     public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
         this.${field.getFName()} = ${field.getFName()};
     }
-
 <#elseif !field.isSystem || field.fieldName == 'ID' >
+
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
     }
@@ -52,7 +52,6 @@ public class ${table.getCName()} extends BaseEntity {
     public void ${field.setterName()}(${field.fieldType.javaType()} ${field.getFName()}) {
         this.${field.getFName()} = ${field.getFName()};
     }
-
 </#if>
 </#list>
 }
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java
index 3371b07d..d1404c75 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java
@@ -10,8 +10,6 @@ package ${basePackage}.frame.base;
 public class BaseFindRequest extends BaseGetAllRequest {
     private int pageNumber = 1;
     private int pageSize = 10;
-    private int beginIndex = 0;
-    private int endIndex = 10;
 
     public int getPageNumber() {
         return pageNumber;
@@ -28,30 +26,4 @@ public class BaseFindRequest extends BaseGetAllRequest {
     public void setPageSize(int pageSize) {
         this.pageSize = pageSize;
     }
-
-    public int getBeginIndex() {
-        beginIndex = pageSize * (pageNumber - 1);
-        return beginIndex;
-    }
-
-    public void setBeginIndex(int beginIndex) {
-        this.beginIndex = beginIndex;
-    }
-
-    public int getEndIndex() {
-        endIndex = pageSize * (pageNumber - 1) + pageSize;
-        return endIndex;
-    }
-
-    public void setEndIndex(int endIndex) {
-        this.endIndex = endIndex;
-    }
-
-    public void updatePageNumber(int totalCount){
-        int maxPage = totalCount / pageSize + (totalCount % pageSize > 0 ? 1 : 0);
-
-        if (pageNumber > maxPage){
-            pageNumber = maxPage;
-        }
-    }
 }