驾校带图片距离查询列表

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolInfoController.java

@@ -1,6 +1,9 @@
 package com.miaxis.app.controller.school;
 
 import com.miaxis.app.school.dto.SchoolInfoDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalVO;
+import com.miaxis.app.school.dto.SchoolInfoVO;
 import com.miaxis.common.constant.Constants;
 import java.util.List;
 import java.util.Map;
@@ -65,9 +68,26 @@ public class SchoolInfoController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<Map<String,Object>> list(@ModelAttribute SchoolInfoDTO schoolInfoDTO){
+    public ResponsePageInfo<SchoolInfoVO> list(@ModelAttribute SchoolInfoDTO schoolInfoDTO){
         startPage();
-        List<Map<String,Object>> list = schoolInfoService.selectSchoolInfoUrlList(schoolInfoDTO);
+        List<SchoolInfoVO> list = schoolInfoService.selectSchoolInfoUrlList(schoolInfoDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 查询驾校信用列表
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:list')")
+    @GetMapping("/evalList")
+    @ApiOperation("查询驾校信用列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SchoolInfoEvalVO> list(@ModelAttribute SchoolInfoEvalDTO schoolInfoEvalDTO){
+        startPage();
+        List<SchoolInfoEvalVO> list = schoolInfoService.selectSchoolInfoEvalList(schoolInfoEvalDTO);
         return toResponsePageInfo(list);
     }
 

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolRegionController.java

@@ -3,6 +3,8 @@ package com.miaxis.app.controller.school;
 import java.util.List;
 
 import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.app.school.dto.SchoolRegionDTO;
+import com.miaxis.app.school.dto.SchoolRegionVO;
 import com.miaxis.app.school.service.ISchoolRegionService;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.poi.ExcelUtil;
@@ -40,7 +42,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 查询驾校训练场列表
      */
-    @PreAuthorize("@ss.hasPermi('system:region:list')")
+    //@PreAuthorize("@ss.hasPermi('system:region:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校训练场列表")
     @ApiImplicitParams({
@@ -53,6 +55,23 @@ public class SchoolRegionController extends BaseController{
         return toResponsePageInfo(list);
     }
 
+    /**
+     * 查询驾校训练场列表（图片距离）
+     */
+    //@PreAuthorize("@ss.hasPermi('system:region:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询驾校训练场列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SchoolRegionVO> list(@ModelAttribute SchoolRegionDTO schoolRegionDTO){
+        startPage();
+        List<SchoolRegionVO> list = schoolRegionService.selectSchoolRegionList(schoolRegionDTO);
+        return toResponsePageInfo(list);
+    }
+
+
     /**
      * 导出驾校训练场列表
      */

hzgzpt-common/src/main/java/com/miaxis/common/utils/uuid/IdUtils.java

@@ -1,5 +1,8 @@
 package com.miaxis.common.utils.uuid;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * ID生成器工具类
  * 
@@ -46,4 +49,16 @@ public class IdUtils
     {
         return UUID.fastUUID().toString(true);
     }
+
+
+    /**
+     * 学员ID生成
+     * @return
+     */
+    public static synchronized String getUserId() {
+        Date date =new Date();
+        String userId = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date);
+        return userId;
+    }
+
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolRegion.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +22,7 @@ import java.util.Date;
 @Data
 @TableName("school_region")
 @ApiModel(value = "SchoolRegion", description = "驾校训练场对象 school_region")
-public class SchoolRegion extends BaseEntity{
+public class SchoolRegion extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
@@ -29,12 +30,6 @@ public class SchoolRegion extends BaseEntity{
     @ApiModelProperty(value = "$column.columnComment")
     private Long id;
 
-    /** 运政ID */
-    @Excel(name = "运政ID")
-    @TableField("school_id")
-    @ApiModelProperty(value = "运政ID")
-    private String schoolId;
-
     /** 驾校全国统一编号 */
     @Excel(name = "驾校全国统一编号")
     @TableField("inscode")
@@ -101,11 +96,6 @@ public class SchoolRegion extends BaseEntity{
     @ApiModelProperty(value = "备案状态： 0：未备案 1：已备案")
     private Long status;
 
-    /** 审核状态： 0：待审核 1：同意启用 2：不同意启用 */
-    @Excel(name = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    @TableField("crdate")
-    @ApiModelProperty(value = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    private Long crdate;
 
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoDTO.java

@@ -36,4 +36,8 @@ public class SchoolInfoDTO  {
     @ApiModelProperty(value = "当前纬度")
     private String lat;
 
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoEvalDTO.java

@@ -0,0 +1,27 @@
+package com.miaxis.app.school.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 驾校对象 school_info
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoDTO", description = "驾校对象 school_infoDTO")
+public class SchoolInfoEvalDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoEvalVO.java

@@ -0,0 +1,39 @@
+package com.miaxis.app.school.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 驾校对象返回对象 SchoolInfoEvalVO
+ * 驾校信息排名列表
+ * @author zhangbin
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoEvalVO", description = "驾校返回对象 SchoolInfoEvalVO")
+public class SchoolInfoEvalVO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校全国统一编号 */
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 评价星级 */
+    @ApiModelProperty(value = "评价星级")
+    private String stars;
+
+    /** 总评价条数 */
+    @ApiModelProperty(value = "总评价条数")
+    private String total;
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoVO.java

@@ -1,6 +1,5 @@
 package com.miaxis.app.school.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
@@ -140,4 +139,5 @@ public class SchoolInfoVO extends BaseBusinessEntity {
     /** 当前距离 */
     @ApiModelProperty(value = "当前距离")
     private String distance;
+
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolRegionDTO.java

@@ -0,0 +1,31 @@
+package com.miaxis.app.school.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 驾校对象 school_info
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoDTO", description = "驾校对象 school_infoDTO")
+public class SchoolRegionDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 当前经度 */
+    @ApiModelProperty(value = "当前经度")
+    private String lon;
+
+    /** 当前纬度 */
+    @ApiModelProperty(value = "当前纬度")
+    private String lat;
+
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolRegionVO.java

@@ -0,0 +1,82 @@
+package com.miaxis.app.school.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 驾校训练场对象 school_region
+ *
+ * @author miaxis
+ * @date 2020-12-23
+ */
+@Data
+@ApiModel(value = "SchoolRegionVO", description = "驾校训练场对象 school_region")
+public class SchoolRegionVO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /** 教学区域名称 */
+    @ApiModelProperty(value = "教学区域名称")
+    private String regionName;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    /** 教学区域地址 */
+    @ApiModelProperty(value = "教学区域地址")
+    private String address;
+
+    /** 区县编号 */
+    @ApiModelProperty(value = "区县编号")
+    private String areaCode;
+
+    /** 教学区域面积 */
+    @ApiModelProperty(value = "教学区域面积")
+    private Long area;
+
+    /** 教学区域类型 1：第二部分；2：第三部分 */
+    @ApiModelProperty(value = "教学区域类型 1：第二部分；2：第三部分")
+    private Long type;
+
+    /** 培训车型 */
+    @ApiModelProperty(value = "培训车型")
+    private String vehicletype;
+
+    /** 可容纳车辆数 */
+    @ApiModelProperty(value = "可容纳车辆数")
+    private Long totalvehnum;
+
+    /** 已投放车辆数 */
+    @ApiModelProperty(value = "已投放车辆数")
+    private Long curvehnum;
+
+
+    /** lon经度 */
+    @ApiModelProperty(value = "已投放车辆数")
+    private Double lon;
+
+    /** lat纬度 */
+    @ApiModelProperty(value = "已投放车辆数")
+    private Double  lat;
+
+
+
+    /** 图片url */
+    @ApiModelProperty(value = "图片url")
+    private String url;
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolInfoMapper.java

@@ -6,6 +6,9 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.app.school.domain.SchoolInfo;
 import com.miaxis.app.school.dto.SchoolInfoDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalVO;
+import com.miaxis.app.school.dto.SchoolInfoVO;
 
 /**
  * 驾校Mapper接口
@@ -37,7 +40,15 @@ public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
      * @param schoolInfoDTO 驾校
      * @return 驾校集合
      */
-    public List<Map<String,Object>> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO);
+    public List<SchoolInfoVO> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO);
+
+    /**
+     * 查询驾校信用列表
+     *
+     * @param schoolInfoEvalDTO 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfoEvalVO> selectSchoolInfoEvalList(SchoolInfoEvalDTO schoolInfoEvalDTO);
 
     /**
      * 新增驾校

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolInfoService.java

@@ -1,11 +1,13 @@
 package com.miaxis.app.school.service;
 
-import java.util.List;
-import java.util.Map;
-
-import com.miaxis.app.school.domain.SchoolInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.school.domain.SchoolInfo;
 import com.miaxis.app.school.dto.SchoolInfoDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalVO;
+import com.miaxis.app.school.dto.SchoolInfoVO;
+
+import java.util.List;
 
 /**
  * 驾校Service接口
@@ -37,7 +39,15 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
      * @param schoolInfoDTO 驾校
      * @return 驾校集合
      */
-    public List<Map<String,Object>> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO);
+    public List<SchoolInfoVO> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO);
+
+    /**
+     * 查询驾校信用列表
+     *
+     * @param schoolInfoEvalDTO 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfoEvalVO> selectSchoolInfoEvalList(SchoolInfoEvalDTO schoolInfoEvalDTO);
 
     /**
      * 新增驾校

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolRegionService.java

@@ -3,6 +3,8 @@ package com.miaxis.app.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.app.school.dto.SchoolRegionDTO;
+import com.miaxis.app.school.dto.SchoolRegionVO;
 
 import java.util.List;
 
@@ -29,6 +31,14 @@ public interface ISchoolRegionService extends IService<SchoolRegion> {
      */
     public List<SchoolRegion> selectSchoolRegionList(SchoolRegion schoolRegion);
 
+    /**
+     * 查询驾校训练场图片列表（经纬度距离）
+     *
+     * @param schoolRegionDTO 驾校训练场
+     * @return 驾校训练场集合
+     */
+    public List<SchoolRegionVO> selectSchoolRegionList(SchoolRegionDTO schoolRegionDTO);
+
     /**
      * 新增驾校训练场
      * 

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolInfoServiceImpl.java

@@ -5,6 +5,9 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.app.school.dto.SchoolInfoDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.app.school.dto.SchoolInfoEvalVO;
+import com.miaxis.app.school.dto.SchoolInfoVO;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,10 +56,22 @@ public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolI
      * @return 驾校
      */
     @Override
-    public List<Map<String,Object>> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO){
+    public List<SchoolInfoVO> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO){
         return schoolInfoMapper.selectSchoolInfoUrlList(schoolInfoDTO);
     }
 
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfoEvalDTO 驾校
+     * @return 驾校
+     */
+    @Override
+    public List<SchoolInfoEvalVO> selectSchoolInfoEvalList(SchoolInfoEvalDTO schoolInfoEvalDTO) {
+        return schoolInfoMapper.selectSchoolInfoEvalList(schoolInfoEvalDTO);
+    }
+
+
     /**
      * 新增驾校
      *

hzgzpt-service-app/src/main/resources/mapper/school/SchoolInfoMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         on s.inscode = m.inscode
         <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
         </where>
 
         <if test="orderName!=null and orderType!=null">
@@ -52,6 +53,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectSchoolInfoEvalList" parameterType="com.miaxis.app.school.dto.SchoolInfoEvalDTO" resultType="com.miaxis.app.school.dto.SchoolInfoEvalVO">
+        SELECT s.inscode,s.name,m.stars,m.total
+        FROM school_info s
+        left join (SELECT inscode,avg(e.STAR) as stars,count(1) as total FROM school_evaluate e GROUP BY inscode) m
+        on s.inscode = m.inscode
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
+        order by stars desc
+    </select>
+
+
+
     <sql id="selectSchoolInfoVo">
         select inscode, name, sname, address, legal_person_id_number, responsible_person, legal_person_name, area_name, area_code, tel, wechar, registration_date, license_number, license_word, license_valid_period_from, license_valid_period_end, credibility_grade, credibility_score, vehicle_sum, regcapital, bizlicense, poi_lon, poi_lat, removed, create_time, update_time, initial_receipt_date, business_status_name, pxcx from school_info
     </sql>

hzgzpt-service-app/src/main/resources/mapper/school/SchoolRegionMapper.xml

@@ -2,11 +2,10 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.app.school.mapper.SchoolRegionMapper">
+<mapper namespace="com.miaxis.school.mapper.SchoolRegionMapper">
     
     <resultMap type="SchoolRegion" id="SchoolRegionResult">
         <result property="id"    column="id"    />
-        <result property="schoolId"    column="school_id"    />
         <result property="inscode"    column="inscode"    />
         <result property="seq"    column="seq"    />
         <result property="name"    column="name"    />
@@ -18,21 +17,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalvehnum"    column="totalvehnum"    />
         <result property="curvehnum"    column="curvehnum"    />
         <result property="status"    column="status"    />
-        <result property="crdate"    column="crdate"    />
         <result property="flag"    column="flag"    />
         <result property="areaCode"    column="area_code"    />
+        <result property="poiLon"    column="poi_lon"    />
+        <result property="poiLat"    column="poi_lat"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <select id="selectSchoolRegionUrlList" parameterType="SchoolRegionDTO" resultType="SchoolRegionVO">
+        SELECT sr.id,sr.NAME region_name,s.NAME school_name,sr.address,
+        sr.area,sr.type,sr.vehicletype,sr.totalvehnum,sr.curvehnum,sr.poi_lon,sr.poi_lat,sri.url,
+        (2 * 6378.137 * ASIN(SQRT(POW( SIN( PI( ) * ( 120.211162- s.poi_lon ) / 360 ), 2 ) + COS( PI( ) * 30.186584 / 180 ) * COS( sr.poi_lat * PI( ) / 180 ) * POW( SIN( PI( ) * ( 30.186584- s.poi_lat ) / 360 ), 2 )) ) ) AS distance
+        FROM school_region sr
+        left JOIN school_info s ON sr.inscode = s.inscode
+        left join school_region_images sri on sr.id = sri. region_id
+        <where>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
+        order by distance desc
+    </select>
+
     <sql id="selectSchoolRegionVo">
-        select id, school_id, inscode, seq, name, address, area, type, vehicletype, polygon, totalvehnum, curvehnum, status, crdate, flag, area_code, create_time, update_time from school_region
+        select id, inscode, seq, name, address, area, type, vehicletype, polygon, totalvehnum, curvehnum, status, flag, area_code, poi_lon, poi_lat, create_time, update_time from school_region
     </sql>
 
     <select id="selectSchoolRegionList" parameterType="SchoolRegion" resultMap="SchoolRegionResult">
         <include refid="selectSchoolRegionVo"/>
         <where>  
-            <if test="schoolId != null  and schoolId != ''"> and school_id = #{schoolId}</if>
             <if test="inscode != null  and inscode != ''"> and inscode = #{inscode}</if>
             <if test="seq != null  and seq != ''"> and seq = #{seq}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -44,9 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null "> and totalvehnum = #{totalvehnum}</if>
             <if test="curvehnum != null "> and curvehnum = #{curvehnum}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="crdate != null "> and crdate = #{crdate}</if>
             <if test="flag != null "> and flag = #{flag}</if>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="poiLon != null "> and poi_lon = #{poiLon}</if>
+            <if test="poiLat != null "> and poi_lat = #{poiLat}</if>
         </where>
     </select>
     
@@ -59,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into school_region
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="schoolId != null">school_id,</if>
             <if test="inscode != null">inscode,</if>
             <if test="seq != null">seq,</if>
             <if test="name != null">name,</if>
@@ -71,15 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null">totalvehnum,</if>
             <if test="curvehnum != null">curvehnum,</if>
             <if test="status != null">status,</if>
-            <if test="crdate != null">crdate,</if>
             <if test="flag != null">flag,</if>
             <if test="areaCode != null">area_code,</if>
+            <if test="poiLon != null">poi_lon,</if>
+            <if test="poiLat != null">poi_lat,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="schoolId != null">#{schoolId},</if>
             <if test="inscode != null">#{inscode},</if>
             <if test="seq != null">#{seq},</if>
             <if test="name != null">#{name},</if>
@@ -91,9 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null">#{totalvehnum},</if>
             <if test="curvehnum != null">#{curvehnum},</if>
             <if test="status != null">#{status},</if>
-            <if test="crdate != null">#{crdate},</if>
             <if test="flag != null">#{flag},</if>
             <if test="areaCode != null">#{areaCode},</if>
+            <if test="poiLon != null">#{poiLon},</if>
+            <if test="poiLat != null">#{poiLat},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -102,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSchoolRegion" parameterType="SchoolRegion">
         update school_region
         <trim prefix="SET" suffixOverrides=",">
-            <if test="schoolId != null">school_id = #{schoolId},</if>
             <if test="inscode != null">inscode = #{inscode},</if>
             <if test="seq != null">seq = #{seq},</if>
             <if test="name != null">name = #{name},</if>
@@ -114,9 +126,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null">totalvehnum = #{totalvehnum},</if>
             <if test="curvehnum != null">curvehnum = #{curvehnum},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="crdate != null">crdate = #{crdate},</if>
             <if test="flag != null">flag = #{flag},</if>
             <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="poiLon != null">poi_lon = #{poiLon},</if>
+            <if test="poiLat != null">poi_lat = #{poiLat},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>