拼团

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

@@ -13,12 +13,7 @@ import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
 import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.entity.TaShareRecord;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaShareActivityService;
-import com.huiju.estateagents.service.ITaShareChildRecordService;
-import com.huiju.estateagents.service.ITaShareRecordService;
-import com.huiju.estateagents.service.TaPosterService;
-import com.huiju.estateagents.service.TaShareContentService;
+import com.huiju.estateagents.service.*;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,6 +56,9 @@ public class TaShareActivityController extends BaseController {
     
     @Autowired
     private TaShareContentService taShareContentService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
     
 
     /**
@@ -74,11 +72,12 @@ public class TaShareActivityController extends BaseController {
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @RequestParam(value ="buildingId",required = false) String buildingId,
                                             @RequestParam(value ="activityName",required = false) String activityName,
-                                            @RequestParam(value ="status",required = false) String status,
+                                            @RequestParam(value ="activityStatus",required = false) String activityStatus,
+                                            @RequestParam(value ="cityId",required = false)Integer cityId,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, status, null, null, getOrgId(request));
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());
@@ -97,6 +96,8 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
+            taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
             taShareActivity.setStatus(0);
             taShareActivity.setActivityStatus(1);

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -80,6 +80,11 @@ public class TaShareActivity implements Serializable {
      */
     private String descImg;
 
+    /**
+     * 城市id
+     */
+    private Integer cityId;
+
     /**
      * 分享id
      */

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface ITaShareActivityService extends IService<TaShareActivity> {
 
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
 
     /**
      * 开始未进行的活动

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

@@ -30,7 +30,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     private TaShareActivityMapper taShareActivityMapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -39,10 +39,11 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.like(activityName != null, "activity_name", activityName);
-        queryWrapper.eq(status != null, "status", status);
+        queryWrapper.eq(activityStatus != null, "activity_status", activityStatus);
         queryWrapper.eq(startTime != null, "start_time", startTime);
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.orderByDesc("group_acticity_id");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);