胡轶钦 5 лет назад
Родитель
Сommit
1dcec5ede9

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Просмотреть файл

93
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
93
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
94
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
94
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
95
                                      @RequestParam(value = "isMain",required = false)Integer isMain){
95
                                      @RequestParam(value = "isMain",required = false)Integer isMain){
96
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
96
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,"1",marketStatus,cityId,isMain);
97
     }
97
     }
98
 
98
 
99
     /**
99
     /**

+ 0
- 6
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Просмотреть файл

30
      */
30
      */
31
     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);
31
     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);
32
 
32
 
33
-    /**
34
-     * 楼盘列表
35
-     * @param page
36
-     * @return
37
-     */
38
-    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);
39
 
33
 
40
 
34
 
41
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
35
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

+ 0
- 7
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Просмотреть файл

26
      */
26
      */
27
     ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
27
     ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
28
 
28
 
29
-    /**
30
-     * 楼盘列表
31
-     * @param pageNum
32
-     * @param pageSize
33
-     * @return
34
-     */
35
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
36
 
29
 
37
     /**
30
     /**
38
      * 楼盘详情
31
      * 楼盘详情

+ 0
- 10
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Просмотреть файл

73
 
73
 
74
         return ResponseBean.success(page);
74
         return ResponseBean.success(page);
75
     }
75
     }
76
-    @Override
77
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
78
-        Page<TaBuilding> page = new Page<>();
79
-        page.setSize(pageSize == null ? 10 : pageSize);
80
-        page.setCurrent(pageNum == null ? 1 : pageNum);
81
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
82
-        page.setRecords(building);
83
-
84
-        return ResponseBean.success(page);
85
-    }
86
 
76
 
87
     @Override
77
     @Override
88
     public ResponseBean buildingSelectId(String id) {
78
     public ResponseBean buildingSelectId(String id) {

+ 0
- 26
src/main/resources/mapper/TaBuildingMapper.xml Просмотреть файл

30
         ORDER BY create_date DESC
30
         ORDER BY create_date DESC
31
     </select>
31
     </select>
32
 
32
 
33
-    <select id="buildingListSelect" resultType="com.huiju.estateagents.entity.TaBuilding">
34
-        SELECT * FROM ta_building
35
-        <where>
36
-            status > -1
37
-            and  ta_building.building_status = 1
38
-            <if test="Name != null and Name != ''">
39
-                and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
40
-            </if>
41
-            <if test="Code != null and Code != ''">
42
-                and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')
43
-            </if>
44
-            <if test="startDate != null">
45
-                and  TO_DAYS(ta_building.opening_date ) = TO_DAYS(#{startDate})
46
-            </if>
47
-            <if test="marketStatus != null and marketStatus != ''">
48
-                and  ta_building.market_status =#{marketStatus}
49
-            </if>
50
-            <if test="cityId != null and cityId != ''">
51
-                and  ta_building.city_id =#{cityId}
52
-            </if>
53
-            <if test="isMain != null and isMain != ''">
54
-                and  ta_building.is_main = #{isMain}
55
-            </if>
56
-        </where>
57
-        ORDER BY create_date DESC
58
-    </select>
59
 
33
 
60
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
34
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
61
          SELECT * FROM ta_building
35
          SELECT * FROM ta_building