albertshaw 8 years ago
parent
commit
ac21a1b538

+ 6 - 0
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -1,5 +1,9 @@
 package com.goafanti.activityUser.service;
 
+import java.util.List;
+
+import org.springframework.ui.ModelMap;
+
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
@@ -25,4 +29,6 @@ public interface ActivityUserService {
 
 	int batchDeleteByPrimaryKey(Long aid, String uid);
 
+	List<ModelMap> selectUserActivities();
+
 }

+ 7 - 0
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -2,10 +2,12 @@ package com.goafanti.activityUser.service.impl;
 
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.activityUser.service.ActivityUserService;
@@ -121,4 +123,9 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 		return activityUserMapper.selectByAidAndUid(aid, uid);
 	}
 
+	@Override
+	public List<ModelMap> selectUserActivities() {
+		return activityUserMapper.selectUserActivities(TokenManager.getUserId());
+	}
+
 }

+ 13 - 8
src/main/java/com/goafanti/common/dao/ActivityUserMapper.java

@@ -1,26 +1,31 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
+import org.springframework.ui.ModelMap;
 
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
 
 public interface ActivityUserMapper {
-    int deleteByPrimaryKey(ActivityUserKey key);
+	int deleteByPrimaryKey(ActivityUserKey key);
 
-    int insert(ActivityUser record);
+	int insert(ActivityUser record);
 
-    int insertSelective(ActivityUser record);
+	int insertSelective(ActivityUser record);
 
-    ActivityUser selectByPrimaryKey(ActivityUserKey key);
+	ActivityUser selectByPrimaryKey(ActivityUserKey key);
 
-    int updateByPrimaryKeySelective(ActivityUser record);
+	int updateByPrimaryKeySelective(ActivityUser record);
 
-    int updateByPrimaryKey(ActivityUser record);
+	int updateByPrimaryKey(ActivityUser record);
 
 	ActivityUser selectByUid(String uid);
 
-	int batchDeleteByPrimaryKey(@Param("aid")Long aid, @Param("uid")String uid);
+	int batchDeleteByPrimaryKey(@Param("aid") Long aid, @Param("uid") String uid);
+
+	ActivityUser selectByAidAndUid(@Param("aid") Long aid, @Param("uid") String uid);
 
-	ActivityUser selectByAidAndUid(@Param("aid")Long aid, @Param("uid")String uid);
+	List<ModelMap> selectUserActivities(@Param("uid") String uid);
 }

+ 8 - 1
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -210,11 +210,18 @@
       and uid = #{uid,jdbcType=VARCHAR}
   </delete>
   
-    <select id="selectByAidAndUid" resultMap="BaseResultMap" >
+  <select id="selectByAidAndUid" resultMap="BaseResultMap" >
     select 
     <include refid="Base_Column_List" />
     from activity_user
     where aid = #{aid,jdbcType=BIGINT}
       and uid = #{uid,jdbcType=VARCHAR}
   </select>
+  <select id="selectUserActivities" resultType="org.springframework.ui.ModelMap">
+	select au.aid as aid, au.uid as uid, a.name as name,a.start_time as startTime, a.end_time as endTime, a.enroll_deadline as enrollDeadline
+    from activity_user au
+    left join activity a on au.aid=a.id
+    where uid = #{uid,jdbcType=VARCHAR}
+    order by au.create_time desc
+  </select>
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -18,6 +18,7 @@ import com.goafanti.achievement.bo.InputAchievementOrder;
 import com.goafanti.achievement.service.AchievementOrderLogService;
 import com.goafanti.achievement.service.AchievementOrderService;
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.activityUser.service.ActivityUserService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
@@ -58,6 +59,13 @@ public class PortalOrderApiController extends CertifyApiController {
 	private AchievementOrderLogService	achievementOrderLogService;
 	@Resource
 	private AchievementOrderService		achievementOrderService;
+	@Resource
+	private ActivityUserService			activityUserService;
+
+	@RequestMapping(value = "/activity", method = RequestMethod.GET)
+	public Result getUserActivityList() {
+		return res().data(activityUserService.selectUserActivities());
+	}
 
 	/**
 	 * 科技成果Log