添加考场地市

nbjk-admin/src/main/java/com/miaxis/app/controller/exam/ExamInfoController.java

@@ -21,13 +21,10 @@ import com.miaxis.exam.vo.ExamInfoCountyVo;
 import com.miaxis.exam.vo.ExamInfoProviceVo;
 import com.miaxis.exam.vo.ExamInfoVipVo;
 import io.swagger.annotations.*;
-import oracle.jdbc.driver.DatabaseError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;

nbjk-service/src/main/java/com/miaxis/exam/vo/ExamInfoVipVo.java

@@ -44,6 +44,14 @@ public class ExamInfoVipVo {
     @ApiModelProperty(value = "城市名称")
     private String city;
 
+    /** 区县ID */
+    @ApiModelProperty(value = "区县ID")
+    private String countyId;
+
+    /** 区县名称 */
+    @ApiModelProperty(value = "区县名称")
+    private String county;
+
     /** 城市名称 */
     @ApiModelProperty(value = "价格")
     private Integer price;

nbjk-service/src/main/resources/mapper/exam/ExamInfoMapper.xml

@@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="province != null  and province != ''"> and province = #{province}</if>
             <if test="cityId != null  and cityId != ''"> and city_id = #{cityId}</if>
             <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="countyId != null  and countyId != ''"> and county_id = #{countyId}</if>
+            <if test="county != null  and county != ''"> and county = #{county}</if>
         </where>
     </select>
 
@@ -52,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="provinceId != null and provinceId != ''" > AND e.province_id = #{provinceId}</if>
             <if test="cityId != null and cityId != ''" > AND e.city_id = #{cityId}</if>
             <if test="city != null and city != ''" > AND e.city = #{city}</if>
+            <if test="countyId != null  and countyId != ''"> and county_id = #{countyId}</if>
+            <if test="county != null  and county != ''"> and county = #{county}</if>
             <if test="name != null  and name != ''"> and e.name like concat('%', #{name}, '%')</if>
         </where>
     </select>
@@ -68,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="provinceId != null and provinceId != ''" > AND e.province_id = #{provinceId}</if>
             <if test="cityId != null and cityId != ''" > AND e.city_id = #{cityId}</if>
             <if test="city != null and city != ''" > AND e.city = #{city}</if>
+            <if test="countyId != null  and countyId != ''"> and county_id = #{countyId}</if>
+            <if test="county != null  and county != ''"> and county = #{county}</if>
             <if test="name != null  and name != ''"> and e.name like concat('%', #{name}, '%')</if>
             <if test="userId != null"> and vu.user_id = #{userId}</if>
         </where>