合并

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

         return responseBean;
     }
     @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "buildingId", paramType = "query", value = "活动状态"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团")
+    })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
-    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request));
+    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
+                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                               @RequestParam(value = "type",required = false)Integer type) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
                 return lsit;
         }
 

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

      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
 }

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

 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
 import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
     @Autowired
     ApplicationContext applicationContext;
 
+    @Autowired
+    TaShareActivityMapper taShareActivityMapper;
+
     @Override
     public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
+        // 根据楼盘id查助力
+        if ("1".equals(type)){
+            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
+            helpActivityQuery.eq("building_id",buildingId);
+            helpActivityQuery.eq("org_id",orgId);
+            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
+            responseBean.addSuccess(list);
+            return responseBean;
+        }
+        // 根据楼盘id查拼团
+        if ("2".equals(type)){
+            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
+            taShareActivityQuery.eq("building_id",buildingId);
+            taShareActivityQuery.eq("org_id",orgId);
+            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
+            responseBean.addSuccess(list);
+            return responseBean;
+        }
+
         List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
         responseBean.addSuccess(HelpActivity);
         return responseBean;