Explorar o código

activityUser list

Antiloveg %!s(int64=8) %!d(string=hai) anos
pai
achega
9beb5a54ba

+ 1 - 1
schema/201707012-lecture.sql

@@ -1,6 +1,6 @@
 CREATE TABLE `lecture` (
   `id` VARCHAR(36) CHARACTER SET 'utf8mb4' NOT NULL,
-  `uid` VARCHAR(36) CHARACTER SET 'utf8mb4' NOT NULL COMMENT '开展讲座人ID',
+  `uid` VARCHAR(36) CHARACTER SET 'utf8mb4'  NULL COMMENT '开展讲座人ID',
   `lecture_time` DATETIME NOT NULL COMMENT '讲座开展时间',
   `create_time` DATETIME NULL COMMENT '记录创建时间',
   `last_update_time` DATETIME NULL COMMENT '记录最后更新时间',

+ 127 - 0
src/main/java/com/goafanti/activityUser/bo/ActivityUserListBo.java

@@ -0,0 +1,127 @@
+package com.goafanti.activityUser.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.ActivityUser;
+
+public class ActivityUserListBo extends ActivityUser {
+	private String	activityName;
+
+	private Integer	number;
+
+	private String	mobile;
+
+	private String	username;
+
+	private String	unitName;
+
+	private Date	startTime;
+
+	private Date	endTime;
+
+	private Date	enrollDeadline;
+
+	public String getActivityName() {
+		return activityName;
+	}
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Date getEnrollDeadline() {
+		return enrollDeadline;
+	}
+
+	public void setEnrollDeadline(Date enrollDeadline) {
+		this.enrollDeadline = enrollDeadline;
+	}
+
+	public String getStartTimeFormattedDate() {
+		if (this.startTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setCreateTimeFormattedDate(String startTimeFormattedDate) {
+
+	}
+
+	public String getEndTimeFormattedDate() {
+		if (this.endTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
+
+	}
+	
+	public String getEnrollDeadlineFormattedDate() {
+		if (this.enrollDeadline == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setEnrollDeadlineFormattedDate(String enrollDeadlineFormattedDate) {
+
+	}
+
+}

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

@@ -1,6 +1,8 @@
 package com.goafanti.activityUser.service;
 
+import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.common.model.ActivityUser;
+import com.goafanti.core.mybatis.page.Pagination;
 
 public interface ActivityUserService {
 
@@ -10,4 +12,10 @@ public interface ActivityUserService {
 
 	int update(ActivityUser au);
 
+	Pagination<ActivityUserListBo> listActivityUser(String activityName, String mobile, String username, Integer number,
+			Integer pageSize, Integer pageNo);
+
+	Pagination<ActivityUserListBo> listActivityOrg(String activityName, String mobile, String unitName, Integer number,
+			Integer pSize, Integer pNo);
+
 }

+ 68 - 2
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -1,19 +1,27 @@
 package com.goafanti.activityUser.service.impl;
 
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.activityUser.service.ActivityUserService;
 import com.goafanti.common.dao.ActivityUserMapper;
 import com.goafanti.common.model.ActivityUser;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+
 @Service
-public class ActivityUserServiceImpl implements ActivityUserService {
-	
+public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper> implements ActivityUserService {
+
 	@Autowired
 	private ActivityUserMapper activityUserMapper;
+
 	@Override
 	public ActivityUser selectByUid(String uid) {
 		return activityUserMapper.selectByUid(uid);
@@ -39,4 +47,62 @@ public class ActivityUserServiceImpl implements ActivityUserService {
 		return activityUserMapper.updateByPrimaryKey(au);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ActivityUserListBo> listActivityUser(String activityName, String mobile, String username,
+			Integer number, Integer pSize, Integer pNo) {
+
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+
+		return (Pagination<ActivityUserListBo>) findPage("findActivityUserListByPage", "findActivityUserCount",
+				disposeActivityList(activityName, mobile, number, username, null), pNo, pSize);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ActivityUserListBo> listActivityOrg(String activityName, String mobile, String unitName,
+			Integer number, Integer pSize, Integer pNo) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<ActivityUserListBo>) findPage("findActivityOrgListByPage", "findActivityOrgCount",
+				disposeActivityList(activityName, mobile, number, null, unitName), pNo, pSize);
+	}
+
+	private Map<String, Object> disposeActivityList(String activityName, String mobile, Integer number, String username,
+			String unitName) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (StringUtils.isNotBlank(mobile)) {
+			params.put("mobile", mobile);
+		}
+
+		if (null != number) {
+			params.put("number", number);
+		}
+
+		if (StringUtils.isNotBlank(activityName)) {
+			params.put("activityName", activityName);
+		}
+
+		if (StringUtils.isNotBlank(username)) {
+			params.put("username", username);
+		}
+		
+		if (StringUtils.isNotBlank(unitName)){
+			params.put("unitName", unitName);
+		}
+		return params;
+	}
+
 }

+ 11 - 0
src/main/java/com/goafanti/admin/controller/AdminActivityApiController.java

@@ -37,6 +37,15 @@ public class AdminActivityApiController extends BaseApiController {
 	private ActivityService	activityService;
 	@Autowired
 	JDBCIdGenerator			idGenerator;
+	
+	/**
+	 * 活动报名列表
+	 */
+	@RequestMapping(value = "/signUpList", method = RequestMethod.GET)
+	public Result signUpList(){
+		Result res = new Result();
+		return res;
+	}
 
 	/**
 	 * 活动列表
@@ -171,6 +180,8 @@ public class AdminActivityApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	
 
 	private Result disposeInputActivity(Result res, InputActivity ia, String startTimeFormattedDate) {
 		if (StringUtils.isBlank(ia.getName())) {

+ 57 - 0
src/main/java/com/goafanti/admin/controller/AdminActivityUserApiController.java

@@ -0,0 +1,57 @@
+package com.goafanti.admin.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.activityUser.service.ActivityUserService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
+
+@RestController
+@RequestMapping(value = "/api/admin/activityUser")
+public class AdminActivityUserApiController extends BaseApiController {
+	@Resource
+	private ActivityUserService activityUserService;
+
+	/**
+	 * 活动圈个人用户报名列表
+	 */
+	@RequestMapping(value = "/userList", method = RequestMethod.GET)
+	public Result activityUserList(String activityName, String mobile, String username, Integer number, String pageSize,
+			String pageNo) {
+		Result res = new Result();
+		res.setData(activityUserService.listActivityUser(activityName, mobile, username, number, getPSize(pageSize), getPNo(pageNo)));
+		return res;
+	}
+
+	/**
+	 * 活动圈组织用户报名列表
+	 */
+	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
+	public Result activityOrgList(String activityName, String mobile, String unitName, Integer number, String pageSize,
+			String pageNo) {
+		Result res = new Result();
+		res.setData(activityUserService.listActivityOrg(activityName, mobile, unitName, number, getPSize(pageSize), getPNo(pageNo)));
+		return res;
+	}
+
+	private Integer getPNo(String pageNo) {
+		Integer pNo = 1;
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		return pNo;
+	}
+
+	private Integer getPSize(String pageSize) {
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		return pSize;
+	}
+}

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminLectureApiController.java

@@ -216,10 +216,10 @@ public class AdminLectureApiController extends BaseApiController {
 
 	private Result disposeLecture(Result res, InputLecture il, String lectureTimeFormattedDate,
 			String endTimeFormattedDate) {
-		if (StringUtils.isBlank(il.getUid())) {
+		/*if (StringUtils.isBlank(il.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "讲堂开展人ID"));
 			return res;
-		}
+		}*/
 
 		if (StringUtils.isBlank(il.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "讲堂名称"));

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

@@ -1060,7 +1060,7 @@
   	and a.audit_status = 3
   	order by a.release_date desc
   	<if test="page_sql!=null">
-			${page_sql}
+		${page_sql}
 	</if>
   </select>
   

+ 116 - 0
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -86,4 +86,120 @@
     from activity_user
     where  uid = #{uid,jdbcType=VARCHAR}
   </select>
+  
+  <select id="findActivityUserListByPage" parameterType="String" resultType="com.goafanti.activityUser.bo.ActivityUserListBo">
+  	select
+  		au.aid,
+  		au.uid,
+  		au.create_time as createTime,
+  		au.last_update_time as lastUpdateTime,
+  		a.name as activityName,
+  		u.number,
+  		u.mobile,
+  		ui.username,
+  		a.start_time as startTime,
+  		a.end_time as endTime,
+  		a.enroll_deadline as enrollDeadline
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join user_identity ui on ui.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 0 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by au.last_update_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findActivityUserCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join user_identity ui on ui.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 0 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
+  
+  <select id="findActivityOrgListByPage" parameterType="String" resultType="com.goafanti.activityUser.bo.ActivityUserListBo">
+  	select
+  		au.aid,
+  		au.uid,
+  		au.create_time as createTime,
+  		au.last_update_time as lastUpdateTime,
+  		a.name as activityName,
+  		u.number,
+  		u.mobile,
+  		oi.unit_name as unitName,
+  		a.start_time as startTime,
+  		a.end_time as endTime,
+  		a.enroll_deadline as enrollDeadline
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join organization_identity oi on oi.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  	order by au.last_update_time desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findActivityOrgCount" parameterType="String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from activity_user au
+  	left join user u on u.id = au.uid
+  	left join organization_identity oi on oi.uid = au.uid
+  	left join activity a on a.id = au.aid
+  	where u.type = 1 
+  	<if test="mobile != null">
+  		and u.mobile = #{mobile,jdbcType=VARCHAR}
+  	</if>
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="activityName != null">
+  		and a.name like CONCAT('%',#{activityName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and ui.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
+  </select>
 </mapper>

+ 28 - 0
src/main/java/com/goafanti/common/model/ActivityUser.java

@@ -2,6 +2,10 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+
 public class ActivityUser extends ActivityUserKey {
     /**
     * 报名时间
@@ -28,4 +32,28 @@ public class ActivityUser extends ActivityUserKey {
     public void setLastUpdateTime(Date lastUpdateTime) {
         this.lastUpdateTime = lastUpdateTime;
     }
+    
+    public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.createTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+    
+    public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
+	}
+    
+    public String getLastUpdateTimeFormattedDate() {
+		if (this.lastUpdateTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.lastUpdateTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+    
+    public void setLastUpdateTimeFormattedDate(String lastUpdateTimeFormattedDate) {
+
+	}
 }