提交

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

@@ -142,9 +142,10 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId);
         return helpActivityList;
     }
 

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

@@ -54,5 +54,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId);
 }

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

@@ -145,5 +145,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId);
 }

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

@@ -221,10 +221,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId);
         responseBean.addSuccess(result);
         return responseBean;
     }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -111,6 +111,9 @@
             <if test="cityId != null and cityId != ''">
                 and ha.city_id = #{cityId}
             </if>
+            <if test="buildingId != null">
+                and building_id = #{buildingId}
+            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>