bugfix

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -93,7 +93,7 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,"1",marketStatus,cityId,isMain);
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
     }
 
     /**

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -30,6 +30,12 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      */
     List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
 
+    /**
+     * 楼盘列表
+     * @param page
+     * @return
+     */
+    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -26,6 +26,13 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      */
     ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
 
+    /**
+     * 楼盘列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
 
     /**
      * 楼盘详情

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -73,6 +73,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         return ResponseBean.success(page);
     }
+    @Override
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
+        Page<TaBuilding> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
+        page.setRecords(building);
+
+        return ResponseBean.success(page);
+    }
 
     @Override
     public ResponseBean buildingSelectId(String id) {

src/main/resources/mapper/TaBuildingMapper.xml

@@ -30,6 +30,31 @@
         ORDER BY create_date DESC
     </select>
 
+    <select id="buildingListSelect" resultType="com.huiju.estateagents.entity.TaBuilding">
+        SELECT * FROM ta_building
+        <where>
+            status =1
+            <if test="Name != null and Name != ''">
+                and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
+            </if>
+            <if test="Code != null and Code != ''">
+                and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="startDate != null">
+                and  TO_DAYS(ta_building.opening_date ) = TO_DAYS(#{startDate})
+            </if>
+            <if test="marketStatus != null and marketStatus != ''">
+                and  ta_building.market_status =#{marketStatus}
+            </if>
+            <if test="cityId != null and cityId != ''">
+                and  ta_building.city_id =#{cityId}
+            </if>
+            <if test="isMain != null and isMain != ''">
+                and  ta_building.is_main = #{isMain}
+            </if>
+        </where>
+        ORDER BY create_date DESC
+    </select>
 
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
          SELECT * FROM ta_building