合并

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -42,12 +42,15 @@ public class BuildingController extends BaseController {
     @ApiOperation(value = "楼盘列表", notes = "楼盘列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "pageNum:分页第几页" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度")
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度"),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "name",value = "name:别名"),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "code",value = "code:状态")
     })
-
     @RequestMapping(value = "/buildinglist", method = RequestMethod.GET)
-    public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize){
-        ResponseBean  responseBean = iBuildingService.buildingList(pageNum,pageSize);
+    public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,
+                                        @RequestParam("name")String name,
+                                                @RequestParam("code")String code){
+        ResponseBean  responseBean = iBuildingService.buildingList(pageNum,pageSize,name,code);
         return responseBean;
     }
 
@@ -92,4 +95,5 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
+
 }

whole-estate/src/main/java/com/example/wholeestate/dao/BuildingMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.wholeestate.model.Building;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,12 +15,13 @@ import com.example.wholeestate.model.Building;
  * @author jobob
  * @since 2019-03-20
  */
+@Mapper
 public interface BuildingMapper extends BaseMapper<Building> {
     /**
      * 楼盘列表
      * @param page
      * @return
      */
-    IPage<Building> buildingList(Page page);
+    IPage<Building> buildingList(Page page, @Param("Name") String name, @Param("Code")String code);
 
 }

whole-estate/src/main/java/com/example/wholeestate/model/Building.java

@@ -89,4 +89,5 @@ public class Building implements Serializable {
      * 楼盘code
      */
     private  Integer code;
+
 }

whole-estate/src/main/java/com/example/wholeestate/service/IBuildingService.java

@@ -20,7 +20,7 @@ public interface IBuildingService extends IService<Building> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingList(Integer pageNum,Integer pageSize);
+    ResponseBean buildingList(Integer pageNum,Integer pageSize,String name,String code);
 
     /**
      * 楼盘详情

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -39,12 +39,12 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     private IdGen idGen = IdGen.get();
 
     @Override
-    public ResponseBean buildingList(Integer pageNum,Integer pageSize) {
+    public ResponseBean buildingList(Integer pageNum,Integer pageSize,String name,String code) {
         ResponseBean response= new ResponseBean();
         Page<Building> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-         IPage<Building> building= buildingMapper.buildingList(page);
+         IPage<Building> building= buildingMapper.buildingList(page,name,code);
         List<Building> buildingList=building.getRecords();
 
         HashMap hashMap= new HashMap<>();

whole-estate/src/main/resources/mapper/BuildingMapper.xml

@@ -3,5 +3,13 @@
 <mapper namespace="com.example.wholeestate.dao.BuildingMapper">
     <select id="buildingList" resultType="com.example.wholeestate.model.Building">
         SELECT * FROM ta_building
+            <where>
+            <if test="Name != null and Name != ''">
+            and  ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="Code != null and Code != ''">
+            and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')
+            </if>
+            </where>
     </select>
 </mapper>