activity

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.activity.controller;
+
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "所有活动", tags = "所有活动")
+public class ActivityController extends BaseController {
+	
+	@Autowired
+	private ActivityServiceI activityService;
+	
+	@Autowired
+	private ITaPersonService taPersonService;
+	
+	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           HttpServletRequest request){
+		String openid = getOpenId(request);
+		Integer orgId = getOrgId(request);
+		ResponseBean  responseBean = new ResponseBean();
+		List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+		if (null == taPersons || taPersons.size() != 1) {
+			return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		TaPerson person = taPersons.get(0);
+		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person);
+		
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.activity.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Data
+public class Activity {
+
+	private Integer id;
+	
+	private String mainImg;
+	
+	private String title;
+	
+	private LocalDateTime startDate;
+	
+	private LocalDateTime endDate;
+	
+	private Integer weight;
+	
+	/**
+	 *  0：进行中 1：未开始 2：已结束 3：已参与（微信端用）
+	 */
+	private Integer activityStatus;
+	
+	private String type;
+}

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -0,0 +1,13 @@
+package com.huiju.estateagents.activity.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ActivityMapper {
+	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status);
+}

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.activity.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+
+public interface ActivityServiceI {
+	
+	/**
+	 * 获取三个活动
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
+}

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -0,0 +1,95 @@
+package com.huiju.estateagents.activity.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import com.huiju.estateagents.activity.mapper.ActivityMapper;
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Service
+public class ActivityServiceImpl implements ActivityServiceI {
+	
+	@Autowired
+	private ActivityMapper activityMapper;
+	
+	@Autowired
+	private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+	
+	@Autowired
+	private TaShareRecordMapper taShareRecordMapper;
+	
+	@Autowired
+	private HelpRecordMapper helpRecordMapper;
+	
+	/**
+	 * 获取三个活动
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//查询是否报名了普通活动
+		QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("person_id",person.getPersonId());
+		List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+		//查询是否报名了分享活动
+		QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
+		taShareRecordQueryWrapper.eq("org_id",orgId);
+		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
+		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
+		//判断是否报名了助力活动
+		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+		helpRecordQueryWrapper.eq("org_id",orgId);
+		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
+		
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL);
+		list.forEach(e -> {
+			if (e.getType().equals("dynamic")){
+				taActivityDynamicEnlists.forEach(dynamic -> {
+					if (e.getId().equals(dynamic.getDynamicId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+			}else if (e.getType().equals("share")){
+				taShareRecords.forEach(share -> {
+					if (e.getId().equals(share.getGroupActivityId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+			}else if (e.getType().equals("help")){
+				helpRecords.forEach(help -> {
+					if (e.getId().equals(help.getHelpActivityId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+			}
+		});
+		pg.setRecords(list);
+		return ResponseBean.success(pg);
+	}
+}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -385,4 +385,7 @@ public class CommConstant {
 	
 	
 	public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
+ 
+	//已参与微信端用
+    public static final Integer ACTIVITY_STATUS_PARTNER = 3;
 }

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import org.slf4j.Logger;
@@ -48,8 +49,8 @@ public class TaDrainageController extends BaseController {
     @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
     public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="drainageId",defaultValue = "10") Integer drainageId,
-                                       @RequestParam(value ="name",defaultValue = "10") String name,
+                                       @RequestParam(value ="drainageId",required = false) Integer drainageId,
+                                       @RequestParam(value ="name",required = false) String name,
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -57,8 +58,8 @@ public class TaDrainageController extends BaseController {
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("drainage_id",drainageId);
-            queryWrapper.like("name",name);
+            queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
+            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);

src/main/resources/mapper/Activity.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
+
+    <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
+        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status}
+        UNION  all
+        SELECT group_acticity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'share' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
+        UNION  all
+        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status}
+        ORDER BY weight desc,activity_status,start_date
+    </select>
+</mapper>