傅行帆 5 年前
父节点
当前提交
a0b83436a2

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java 查看文件

132
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
132
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
133
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
133
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
134
                                          @RequestParam(value = "status", required = false) Integer status,
134
                                          @RequestParam(value = "status", required = false) Integer status,
135
+                                         @RequestParam(value = "name", required = false) String name,
135
                                          HttpServletRequest request) {
136
                                          HttpServletRequest request) {
136
         Integer orgId = getOrgId(request);
137
         Integer orgId = getOrgId(request);
137
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status);
138
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name);
138
         return helpActivityList;
139
         return helpActivityList;
139
     }
140
     }
140
 
141
 

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java 查看文件

109
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
109
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
110
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
110
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
111
                                             @RequestParam(value ="buildingId",required = false)String buildingId,
111
                                             @RequestParam(value ="buildingId",required = false)String buildingId,
112
+                                            @RequestParam(value ="name",required = false)String name,
112
                                             @RequestParam(value ="status",required = false)Integer status,
113
                                             @RequestParam(value ="status",required = false)Integer status,
113
                                             HttpServletRequest request){
114
                                             HttpServletRequest request){
114
         ResponseBean responseBean = new ResponseBean();
115
         ResponseBean responseBean = new ResponseBean();
115
         try {
116
         try {
116
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status);
117
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name);
117
         }catch (Exception e){
118
         }catch (Exception e){
118
             e.printStackTrace();
119
             e.printStackTrace();
119
             logger.error("taShareActivityList -=- {}",e.toString());
120
             logger.error("taShareActivityList -=- {}",e.toString());

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java 查看文件

54
      * @param orgId
54
      * @param orgId
55
      * @return
55
      * @return
56
      */
56
      */
57
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status);
57
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
58
 }
58
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java 查看文件

145
      * @param orgId
145
      * @param orgId
146
      * @return
146
      * @return
147
      */
147
      */
148
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status);
148
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
149
 }
149
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java 查看文件

42
      * @param orgId
42
      * @param orgId
43
      * @return
43
      * @return
44
      */
44
      */
45
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status);
45
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name);
46
 
46
 
47
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
47
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
48
 }
48
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java 查看文件

222
     }
222
     }
223
 
223
 
224
     @Override
224
     @Override
225
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status) {
225
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name) {
226
         ResponseBean responseBean = new ResponseBean<>();
226
         ResponseBean responseBean = new ResponseBean<>();
227
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
227
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
228
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status);
228
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name);
229
         responseBean.addSuccess(result);
229
         responseBean.addSuccess(result);
230
         return responseBean;
230
         return responseBean;
231
     }
231
     }

+ 3
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java 查看文件

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.StringUtils;
8
 import com.huiju.estateagents.entity.TaShareActivity;
9
 import com.huiju.estateagents.entity.TaShareActivity;
9
 import com.huiju.estateagents.entity.TaShareRecord;
10
 import com.huiju.estateagents.entity.TaShareRecord;
10
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
11
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
82
     }
83
     }
83
 
84
 
84
     @Override
85
     @Override
85
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status) {
86
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name) {
86
         ResponseBean responseBean = new ResponseBean();
87
         ResponseBean responseBean = new ResponseBean();
87
         Page<TaShareActivity> page = new Page<>();
88
         Page<TaShareActivity> page = new Page<>();
88
         page.setSize(pageSize == null ? 10 : pageSize);
89
         page.setSize(pageSize == null ? 10 : pageSize);
94
         queryWrapper.eq(status != null, "status", status);
95
         queryWrapper.eq(status != null, "status", status);
95
         queryWrapper.eq(cityId != null, "city_id", cityId);
96
         queryWrapper.eq(cityId != null, "city_id", cityId);
96
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
97
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
98
+        queryWrapper.like(!StringUtils.isEmpty(name), "activity_name", name);
97
         queryWrapper.orderByAsc("activity_status");
99
         queryWrapper.orderByAsc("activity_status");
98
         queryWrapper.orderByAsc("start_time");
100
         queryWrapper.orderByAsc("start_time");
99
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
101
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

+ 3
- 0
src/main/resources/mapper/HelpActivityMapper.xml 查看文件

110
             <if test="cityId != null and cityId != ''">
110
             <if test="cityId != null and cityId != ''">
111
                 and ha.city_id = #{cityId}
111
                 and ha.city_id = #{cityId}
112
             </if>
112
             </if>
113
+            <if test="name != null and name != ''">
114
+                and ha.title like CONCAT('%', #{name}, '%')
115
+            </if>
113
             <if test="buildingId != null">
116
             <if test="buildingId != null">
114
                 and building_id = #{buildingId}
117
                 and building_id = #{buildingId}
115
             </if>
118
             </if>