fix 新增网格id

boman-web-core/src/main/java/com/boman/web/core/domain/GridInfo.java

@@ -18,14 +18,10 @@ public class GridInfo extends BaseEntity
     /** 网格id */
     private Long id;
 
-    /** 区域名称 */
-    @Excel(name = "区域名称")
+    /** 名称 */
+    @Excel(name = "名称")
     private String areaName;
 
-    /** 网格名称 */
-    @Excel(name = "网格名称")
-    private String gridName;
-
     /** 排序 */
     @Excel(name = "排序")
     private String sort;
@@ -67,15 +63,7 @@ public class GridInfo extends BaseEntity
     {
         return areaName;
     }
-    public void setGridName(String gridName) 
-    {
-        this.gridName = gridName;
-    }
 
-    public String getGridName() 
-    {
-        return gridName;
-    }
     public void setSort(String sort) 
     {
         this.sort = sort;
@@ -109,7 +97,6 @@ public class GridInfo extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("areaName", getAreaName())
-            .append("gridName", getGridName())
             .append("sort", getSort())
             .append("type", getType())
             .append("createBy", getCreateBy())

boman-web-core/src/main/resources/mapper/GridInfoMapper.xml

@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="areaName"    column="area_name"    />
         <result property="pid"    column="pid"    />
-        <result property="gridName"    column="grid_name"    />
         <result property="sort"    column="sort"    />
         <result property="type"    column="type"    />
         <result property="createBy"    column="create_by"    />
@@ -19,14 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGridInfoVo">
-        select id, area_name, pid,grid_name, sort, type, create_by, create_time, update_by, update_time, is_del from grid_info
+        select id, area_name, pid, sort, type, create_by, create_time, update_by, update_time, is_del from grid_info
     </sql>
 
     <select id="selectGridInfoList" parameterType="GridInfo" resultMap="GridInfoResult">
         <include refid="selectGridInfoVo"/>
         <where>  
             <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
-            <if test="gridName != null  and gridName != ''"> and grid_name like concat('%', #{gridName}, '%')</if>
             <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
             <if test="pid != null  and pid != ''"> and pid = #{pid}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
@@ -44,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaName != null and areaName != ''">area_name,</if>
             <if test="pid != null and pid != ''">pid,</if>
-            <if test="gridName != null and gridName != ''">grid_name,</if>
             <if test="sort != null and sort != ''">sort,</if>
             <if test="type != null">type,</if>
             <if test="createBy != null">create_by,</if>
@@ -56,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="areaName != null and areaName != ''">#{areaName},</if>
             <if test="pid != null and pid != ''">#{pid},</if>
-            <if test="gridName != null and gridName != ''">#{gridName},</if>
             <if test="sort != null and sort != ''">#{sort},</if>
             <if test="type != null">#{type},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -72,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaName != null and areaName != ''">area_name = #{areaName},</if>
             <if test="pid != null and pid != ''">pid = #{pid},</if>
-            <if test="gridName != null and gridName != ''">grid_name = #{gridName},</if>
             <if test="sort != null and sort != ''">sort = #{sort},</if>
             <if test="type != null">type = #{type},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -96,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="treeSelect" parameterType="GridInfo" resultMap="GridInfoResult">
-        select id,area_name, grid_name, sort, type,pid from grid_info
+        select id,area_name, sort, type,pid from grid_info
         <where>
             is_del = 'N'
             <if test="pid != null "> and pid =#{pid}</if>