活动列表页

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

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.activity.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.TaRecommendCustomer;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +33,9 @@ public class ActivityController extends BaseController {
 	@Autowired
 	private ITaPersonService taPersonService;
 	
+	@Autowired
+	ITaRecommendCustomerService taRecommendCustomerService;
+	
 	@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,
@@ -47,4 +53,29 @@ public class ActivityController extends BaseController {
 		
 		return responseBean;
 	}
+	
+	@RequestMapping(value = "/wx/customer/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxActivityList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "customerId") String customerId,
+	                                           HttpServletRequest request){
+		ResponseBean  responseBean = new ResponseBean();
+		Integer orgId = getOrgId(request);
+		//查找客户信息
+		QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("customer_id",customerId);
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
+		if (null == taRecommendCustomer){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if (null == taRecommendCustomer.getPersonId()){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
+		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
+		return responseBean;
+	}
 }

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

@@ -6,8 +6,18 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface ActivityMapper {
 	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
+	
+	/**
+	 * 获取客户参与的活动列表
+	 * @param pg
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	List<Map<String,Object>> getCustomerActivityList(Page pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

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

@@ -14,4 +14,14 @@ public interface ActivityServiceI {
 	 * @return
 	 */
 	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
+	
+	/**
+	 * 获取客户参加的活动信息
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
 }

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -113,4 +114,22 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		pg.setRecords(list);
 		return ResponseBean.success(pg);
 	}
+	
+	/**
+	 * 获取客户参加的活动信息
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Map<String, Object>> customerActivityList = activityMapper.getCustomerActivityList(pg, orgId, person.getPersonId());
+		pg.setRecords(customerActivityList);
+		return ResponseBean.success(pg);
+	}
 }

src/main/resources/mapper/Activity.xml

@@ -25,4 +25,80 @@
         </if>
         ORDER BY weight desc,activity_status,start_date
     </select>
+    <select id="getCustomerActivityList" resultType="java.util.Map">
+        SELECT
+            t.enlist_id AS id,
+            t.dynamic_id AS activityId,
+            t.create_date AS createDate,
+            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
+            d.img_url AS mainImg,
+            d.title,
+            d.start_date AS startDate,
+            d.enlist_end AS endDate,
+            'dynamic' AS type
+        FROM
+            ta_activity_dynamic_enlist t
+            LEFT JOIN ta_building_dynamic d ON t.dynamic_id = d.dynamic_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.record_id AS id,
+            t.group_activity_id AS activityId,
+            t.create_time AS createDate,
+        CASE
+            WHEN t.STATUS = 1 THEN
+            "进行中"
+            WHEN t.STATUS = 0
+            AND t.verification_status = 1 THEN
+            "成功已核销"
+        WHEN t.STATUS = 0
+        AND t.verification_status != 1 THEN
+        "成功未核销"
+        WHEN t.STATUS = 2 THEN
+        "失败"
+        END `status`,
+            d.main_img AS mainImg,
+            d.activity_name AS title,
+            d.start_time AS startDate,
+            d.end_time AS endDate,
+            'group' AS type
+        FROM
+            ta_share_record t
+            LEFT JOIN ta_share_activity d ON t.group_activity_id = d.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.help_record_initiate_id AS id,
+            t.help_activity_id AS activityId,
+            t.create_date AS createDate,
+        CASE
+                WHEN t.STATUS = 1 THEN
+                "进行中"
+                WHEN t.STATUS = 0
+                AND t.verification_status = 1 THEN
+                    "成功已核销"
+                    WHEN t.STATUS = 0
+                    AND t.verification_status != 1 THEN
+                        "成功未核销"
+                        WHEN t.STATUS = 2 THEN
+                        "失败"
+                    END `status`,
+            d.img AS mainImg,
+            d.title,
+            d.start_date AS startDate,
+            d.end_date AS endDate,
+            'help' AS type
+        FROM
+            ta_help_initiate_record t
+            LEFT JOIN ta_help_activity d ON t.help_activity_id = d.help_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+        ORDER BY
+        createDate DESC
+    </select>
 </mapper>