学员活动购买

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ActivityUserMapperDao.java

@@ -134,4 +134,8 @@ public interface ActivityUserMapperDao extends BaseDAO<Integer, ActivityUserMapp
     List<ActivityUserMapperDetailDto> queryDetailPage(Map<String, Object> params);
 
     int countDetailPage(Map<String, Object> params);
+
+    int countSumPage(Map<String, Object> params);
+
+    List<ActivityUserMapperSumDto> querySumPage(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityUserMapperSumDto.java

@@ -0,0 +1,160 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ActivityUserMapperSumDto {
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "学员姓名")
+    private String username;
+
+    @ApiModelProperty(value = "学员编号")
+    private Integer userId;
+
+    @ApiModelProperty(value = "分部")
+    private Integer organId;
+
+    @ApiModelProperty(value = "分部")
+    private String organName;
+
+    @ApiModelProperty(value = "1v1")
+    private String one;
+
+    @ApiModelProperty(value = "1v2")
+    private String two;
+
+    @ApiModelProperty(value = "1v3")
+    private String three;
+
+    @ApiModelProperty(value = "1v4")
+    private String four;
+
+    @ApiModelProperty(value = "1v5")
+    private String five;
+
+    @ApiModelProperty(value = "1v6")
+    private String six;
+
+    @ApiModelProperty(value = "1v7")
+    private String seven;
+
+    @ApiModelProperty(value = "乐理")
+    private String theory;
+
+    @ApiModelProperty(value = "网管")
+    private String practice;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getOne() {
+        return one;
+    }
+
+    public void setOne(String one) {
+        this.one = one;
+    }
+
+    public String getTwo() {
+        return two;
+    }
+
+    public void setTwo(String two) {
+        this.two = two;
+    }
+
+    public String getThree() {
+        return three;
+    }
+
+    public void setThree(String three) {
+        this.three = three;
+    }
+
+    public String getFour() {
+        return four;
+    }
+
+    public void setFour(String four) {
+        this.four = four;
+    }
+
+    public String getFive() {
+        return five;
+    }
+
+    public void setFive(String five) {
+        this.five = five;
+    }
+
+    public String getSix() {
+        return six;
+    }
+
+    public void setSix(String six) {
+        this.six = six;
+    }
+
+    public String getSeven() {
+        return seven;
+    }
+
+    public void setSeven(String seven) {
+        this.seven = seven;
+    }
+
+    public String getTheory() {
+        return theory;
+    }
+
+    public void setTheory(String theory) {
+        this.theory = theory;
+    }
+
+    public String getPractice() {
+        return practice;
+    }
+
+    public void setPractice(String practice) {
+        this.practice = practice;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityUserMapper.java

@@ -118,6 +118,17 @@ public class ActivityUserMapper extends BaseEntity {
 	@ApiModelProperty(value = "关联的云教练缴费项目编号")
 	private Long calenderId;
 
+	@ApiModelProperty(value = "分部")
+	private Integer organId;
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
 	public Long getCalenderId() {
 		return calenderId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/ActivityUserMapperService.java

@@ -10,6 +10,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import org.apache.ibatis.annotations.Param;
+import org.snaker.engine.access.Page;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -200,11 +201,13 @@ public interface ActivityUserMapperService extends BaseService<Integer, Activity
     * @author zx
     * @date 2022/8/3 13:44
     */
-    void subCourseConvert(List<CourseScheduleStudentPayment> studentPayments, Integer studentId, Integer singleClassMinutes,Integer categoryId);
+    void subCourseConvert(List<CourseScheduleStudentPayment> studentPayments, Integer studentId, VipGroup vipGroup);
 
     ActivityUserMapperDao getDao();
 
     void use(List<ActivityUserMapper> activityUserMappers, List<ActivityUserMapper> freeActivityUserMappers, BaseMapDto<Integer,Integer> indexDto,Long groupId,CourseScheduleStudentPayment courseScheduleStudentPayment);
 
     PageInfo<ActivityUserMapperDetailDto> queryDetailPage(ActivityUserMapperDetailQueryInfo queryInfo);
+
+    PageInfo<ActivityUserMapperSumDto> querySumPage(ActivityUserMapperDetailQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ActivityUserMapperServiceImpl.java

@@ -174,7 +174,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		Integer operatorId = sysUser.getId();
 		String operatorName = sysUser.getRealName();
-		Integer minCourseNum = activity.getMinCourseNum();
+//		Integer minCourseNum = activity.getMinCourseNum();
 
 		List<Integer> studentIds = activityStudentAdjustDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
 		List<Student> studentTeacher = studentDao.findByStudentIds(studentIds);
@@ -220,6 +220,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 				activityUserMapper.setReturnFee(false);
 				activityUserMapper.setTeacherId(teacherId);
 				activityUserMapper.setAddMemo(memo);
+				activityUserMapper.setOrganId(sysUser.getOrganId());
 				boolean buyFlag = adjustDto.getCourseNum() > i;
 				if(buyFlag){
 					if("VIP".equals(courseType)){
@@ -348,6 +349,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 			activityUserMapper.setTeacherId(student.getTeacherId());
 			activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
 			activityUserMapper.setCalenderId(calenderId);
+			activityUserMapper.setOrganId(studentPaymentOrder.getOrganId());
 			if(orderDetail.getType() == OrderDetailTypeEnum.VIP){
 				activityUserMapper.setVipFlag(1);
 			}else {
@@ -1084,19 +1086,19 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
     }
 
 	@Override
-	public void subCourseConvert(List<CourseScheduleStudentPayment> studentPayments, Integer studentId, Integer singleClassMinutes,Integer categoryId) {
+	public void subCourseConvert(List<CourseScheduleStudentPayment> studentPayments, Integer studentId,VipGroup vipGroup) {
 		studentPayments = studentPayments.stream().filter(e->e.getActualPrice().compareTo(ZERO) > 0).collect(Collectors.toList());
 		if(CollectionUtils.isEmpty(studentPayments)){
 			return;
 		}
 		ActivityUserMapper activityUserMapper = new ActivityUserMapper();
 		activityUserMapper.setReturnFee(false);
-		activityUserMapper.setSingleCourseTime(singleClassMinutes);
+		activityUserMapper.setSingleCourseTime(vipGroup.getSingleClassMinutes());
 		activityUserMapper.setTotalCourseNum(studentPayments.size());
 		activityUserMapper.setSubCourseNum(studentPayments.size());
-		if(Objects.nonNull(categoryId)){
+		if(Objects.nonNull(vipGroup.getVipGroupCategoryId())){
 			activityUserMapper.setVipFlag(1);
-			activityUserMapper.setCategoryId(categoryId);
+			activityUserMapper.setCategoryId(vipGroup.getVipGroupCategoryId());
 			activityUserMapper.setAddMemo("学员休学转化排课资格:" + studentPayments.get(0).getMusicGroupId());
 		}else {
 			activityUserMapper.setPracticeFlag(1);
@@ -1109,6 +1111,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		activityUserMapper.setTenantId(student.getTenantId());
 		activityUserMapper.setTeacherId(student.getTeacherId());
 		activityUserMapper.setUserId(studentId);
+		activityUserMapper.setOrganId(vipGroup.getOrganId());
 		activityUserMapperDao.insert(activityUserMapper);
 	}
 
@@ -1199,4 +1202,28 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		return pageInfo;
 	}
 
+	@Override
+	public PageInfo<ActivityUserMapperSumDto> querySumPage(ActivityUserMapperDetailQueryInfo queryInfo) {
+		PageInfo<ActivityUserMapperSumDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<ActivityUserMapperSumDto> dataList = null;
+		int count = activityUserMapperDao.countSumPage(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = activityUserMapperDao.querySumPage(params);
+			List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
+			Map<Integer, String> organNameMap = this.getMap("organization", "id_", "name_", organIds, queryInfo.getTenantId(), Integer.class, String.class);
+			for (ActivityUserMapperSumDto sumDto : dataList) {
+				sumDto.setOrganName(organNameMap.get(sumDto.getOrganId()));
+			}
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -707,6 +707,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             activityUserMapper.setActualPrice(BigDecimal.ZERO);
             activityUserMapper.setSubNoCoursePrice(BigDecimal.ZERO);
             activityUserMapper.setReturnFee(false);
+            activityUserMapper.setOrganId(studentPaymentOrder.getOrganId());
             //如果是买的商品1那么赠送陪练课和训练营
             if(Objects.equals(studentPaymentOrder.getClassGroupId(),1)){
                 //赠送陪练课

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderDetailServiceImpl.java

@@ -296,6 +296,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
                         Student student = studentDao.get(studentId);
                         activityUserMapper.setUserId(studentId);
                         activityUserMapper.setTeacherId(student.getTeacherId());
+                        activityUserMapper.setOrganId(musicGroup.getOrganId());
                         VipGroupActivity activity = collect.get(activityUserMapper.getActivityId());
                         activityUserMapperService.copyProperty(activityUserMapper,activity,false,true);
                         if ("网管课".equals(calenderActivity.getCategoryName())) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -749,7 +749,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                         cloudTeacherOrder.setOrganId(musicGroup.getOrganId());
                         cloudTeacherOrder.setType(calenderMember.getPeriod());
                         cloudTeacherOrder.setStudentId(Integer.parseInt(studentId));
-                        cloudTeacherOrder.setOrderId(musicGroup.getOrganId().longValue());
                         cloudTeacherOrder.setTime(calenderMember.getNum().intValue());
                         cloudTeacherOrder.setAmount(BigDecimal.ZERO);
                         cloudTeacherOrder.setStatus(1);
@@ -768,6 +767,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                             Student student = studentDao.get(Integer.parseInt(studentId));
                             activityUserMapper.setUserId(Integer.parseInt(studentId));
                             activityUserMapper.setTeacherId(student.getTeacherId());
+                            activityUserMapper.setOrganId(musicGroup.getOrganId());
                             if ("网管课".equals(calenderActivity.getCategoryName())) {
                                 activityUserMapper.setPracticeFlag(1);
                             } else {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -4339,6 +4339,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             activityUserMapper.setActualPrice(order.getExpectAmount());
             activityUserMapper.setSubNoCoursePrice(order.getExpectAmount());
             activityUserMapper.setTenantId(order.getTenantId());
+            activityUserMapper.setOrganId(order.getOrganId());
             activityUserMapperService.copyProperty(activityUserMapper,activity,false,true);
             if (activity.isPayToBalance()) {
                 sysUserCashAccountService.appendCourseBalance(userId, studentPaymentOrder.getExpectAmount(), PlatformCashAccountDetailTypeEnum.RECHARGE, "通用营销活动购买");

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -812,6 +812,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             activityUserMapper.setTeacherId(teacherId);
             activityUserMapper.setActualPrice(studentPaymentOrder.getExpectAmount());
             activityUserMapper.setAddMemo(activity.getName());
+            activityUserMapper.setOrganId(studentPaymentOrder.getOrganId());
             //如果是课程活动
             if(activity.getActivityType().equals(0)){
                 activityUserMapper.setSubNoCoursePrice(activityUserMapper.getActualPrice());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2895,7 +2895,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         List<CourseScheduleStudentPayment> studentPayments = courseScheduleStudentPaymentDao.findNotStartCourseStudentPaymentsWithClassGroupAndStudent(classGroup.getId(), studentId);
         if (!CollectionUtils.isEmpty(studentPayments)) {
             //学员休学转化排课资格
-            activityUserMapperService.subCourseConvert(studentPayments,studentId,vipGroup.getSingleClassMinutes(),vipGroup.getVipGroupCategoryId());
+            activityUserMapperService.subCourseConvert(studentPayments,studentId,vipGroup);
             List<Integer> studentPaymentIds = studentPayments.stream().map(e -> e.getId().intValue()).collect(Collectors.toList());
             courseScheduleStudentPaymentDao.batchDeleteWithID(studentPaymentIds);
         }

mec-biz/src/main/resources/config/mybatis/ActivityUserMapperMapper.xml

@@ -40,6 +40,7 @@
 		<result column="give_coupon_id_" property="giveCouponId" />
 		<result column="create_time_" property="createTime" />
 		<result column="calender_id_" property="calenderId" />
+		<result column="organ_id_" property="organId" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
@@ -61,13 +62,13 @@
 										  vip_group_id_,give_vip_group_id_,practice_group_id_,give_practice_group_id_,return_fee_,
 		                                  member_order_id_,give_member_order_id_,teacher_id_,actual_price_,add_memo_,cut_memo_,tenant_id_,give_coupon_id_,
 										  total_course_num_,total_give_course_num_,sub_course_num_,sub_give_course_num_,sub_no_course_price_,single_course_time_,
-		                                  give_single_course_time_,category_id_,give_category_id_,calender_id_)
+		                                  give_single_course_time_,category_id_,give_category_id_,calender_id_,organ_id_)
 		                                  VALUES(#{activityId},#{userId},#{vipFlag},#{giveVipFlag},#{practiceFlag},
 		                                         #{givePracticeFlag},#{memberFlag},#{giveMemberFlag},NOW(),NOW(),#{paymentOrderId},#{vipGroupId},
 		                                         #{giveVipGroupId},#{practiceGroupId},#{givePracticeGroupId},#{returnFee},
 		                                         #{memberOrderId},#{giveMemberOrderId},#{teacherId},#{actualPrice},#{addMemo},#{cutMemo},#{tenantId},#{giveCouponId},
 		                                         #{totalCourseNum},#{totalGiveCourseNum},#{subCourseNum},#{subGiveCourseNum},#{subNoCoursePrice},
-		                                         #{singleCourseTime},#{giveSingleCourseTime},#{categoryId},#{giveCategoryId},#{calenderId})
+		                                         #{singleCourseTime},#{giveSingleCourseTime},#{categoryId},#{giveCategoryId},#{calenderId},#{organId})
 	</insert>
     <insert id="batchInsert">
 		INSERT INTO activity_user_mapper (activity_id_,user_id_,vip_flag_,give_vip_flag_,
@@ -75,7 +76,7 @@
 		vip_group_id_,give_vip_group_id_,practice_group_id_,give_practice_group_id_,return_fee_,member_order_id_,
 		                                  give_member_order_id_,teacher_id_,actual_price_,add_memo_,cut_memo_,tenant_id_,give_coupon_id_,
 		total_course_num_,total_give_course_num_,sub_course_num_,sub_give_course_num_,sub_no_course_price_,single_course_time_,
-		                                  give_single_course_time_,category_id_,give_category_id_,calender_id_)
+		                                  give_single_course_time_,category_id_,give_category_id_,calender_id_,organ_id_)
 		VALUES
 		<foreach collection="activityUserMappers" item="item" separator=",">
 			(#{item.activityId},#{item.userId},#{item.vipFlag},#{item.giveVipFlag},#{item.practiceFlag},
@@ -84,7 +85,7 @@
 			 #{item.memberOrderId},#{item.giveMemberOrderId},#{item.teacherId},#{item.actualPrice},#{item.addMemo},#{item.cutMemo},
 			 #{item.tenantId},#{item.giveCouponId},#{item.totalCourseNum},#{item.totalGiveCourseNum},#{item.subCourseNum},
 			 #{item.subGiveCourseNum},#{item.subNoCoursePrice},#{item.singleCourseTime},#{item.giveSingleCourseTime},
-			 #{item.categoryId},#{item.giveCategoryId},#{item.calenderId})
+			 #{item.categoryId},#{item.giveCategoryId},#{item.calenderId},#{item.organId})
 		</foreach>
 	</insert>
     <!-- 根据主键查询一条记录 -->
@@ -626,4 +627,54 @@
 		left join sys_user su ON su.id_ = aum.user_id_
 		<include refid="queryDetailPageSql"/>
 	</select>
+	<resultMap id="ActivityUserMapperSumDto" type="com.ym.mec.biz.dal.dto.ActivityUserMapperSumDto">
+		<result property="organId" column="organ_id_"/>
+		<result property="userId" column="user_id_"/>
+		<result property="username" column="username_"/>
+		<result property="phone" column="phone_"/>
+		<result property="one" column="one"/>
+		<result property="two" column="two"/>
+		<result property="three" column="three"/>
+		<result property="four" column="four"/>
+		<result property="five" column="five"/>
+		<result property="six" column="six"/>
+		<result property="seven" column="seven"/>
+		<result property="theory" column="theory"/>
+		<result property="practice" column="practice"/>
+	</resultMap>
+	<sql id="querySumPageSql">
+		<where>
+			aum.return_fee_ = 0 and aum.total_course_num_ > 0
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(su.organ_id_,#{organId})
+			</if>
+			<if test="search != null and search != ''">
+				AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})
+			</if>
+		</where>
+	</sql>
+	<select id="countSumPage" resultType="java.lang.Integer">
+		select COUNT(DISTINCT aum.user_id_)
+		from activity_user_mapper aum
+		left join sys_user su ON su.id_ = aum.user_id_
+		<include refid="querySumPageSql"/>
+	</select>
+	<select id="querySumPage" resultType="com.ym.mec.biz.dal.dto.ActivityUserMapperSumDto">
+		select aum.user_id_,su.organ_id_,su.username_,su.phone_,
+			   CONCAT(SUM(CASE WHEN vgc.name_ = '1v1' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v1' THEN aum.total_course_num_ ELSE 0 END)) 'one',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '1v2' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v2' THEN aum.total_course_num_ ELSE 0 END)) 'two',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '1v3' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v3' THEN aum.total_course_num_ ELSE 0 END)) 'three',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '1v4' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v4' THEN aum.total_course_num_ ELSE 0 END)) 'four',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '1v5' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v5' THEN aum.total_course_num_ ELSE 0 END)) 'five',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '1v6' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v6' THEN aum.total_course_num_ ELSE 0 END)) 'six',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '1v7' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '1v7' THEN aum.total_course_num_ ELSE 0 END)) 'seven',
+				CONCAT(SUM(CASE WHEN vgc.name_ = '乐理课' THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ = '乐理课' THEN aum.total_course_num_ ELSE 0 END)) 'theory',
+				CONCAT(SUM(CASE WHEN vgc.name_ IS NULL THEN aum.sub_course_num_ ELSE 0 END) ,'/',SUM(CASE WHEN vgc.name_ IS NULL THEN aum.total_course_num_ ELSE 0 END)) 'practice'
+		from activity_user_mapper aum
+		left join vip_group_category vgc ON vgc.id_ = aum.category_id_
+		left join sys_user su ON su.id_ = aum.user_id_
+		<include refid="querySumPageSql"/>
+		group by aum.user_id_
+		<include refid="global.limit"/>
+	</select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/ActivityUserMapperController.java

@@ -2,11 +2,11 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.ActivityUserMapperAddDto;
 import com.ym.mec.biz.dal.dto.ActivityUserMapperDetailDto;
+import com.ym.mec.biz.dal.dto.ActivityUserMapperSumDto;
 import com.ym.mec.biz.dal.entity.ActivityUserMapper;
 import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
 import com.ym.mec.biz.dal.page.ActivityUserMapperDetailQueryInfo;
 import com.ym.mec.biz.service.ActivityUserMapperService;
-import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.SysUserCashAccountLogService;
 import com.ym.mec.common.controller.BaseController;
@@ -80,4 +80,12 @@ public class ActivityUserMapperController extends BaseController {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(activityUserMapperService.queryDetailPage(queryInfo));
     }
+
+    @ApiOperation(value = "获取列表")
+    @PostMapping("/querySumPage")
+    @PreAuthorize("@pcs.hasPermissions('activityUserMapper/querySumPage')")
+    public HttpResponseResult<PageInfo<ActivityUserMapperSumDto>> querySumPage(@RequestBody ActivityUserMapperDetailQueryInfo queryInfo){
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        return succeed(activityUserMapperService.querySumPage(queryInfo));
+    }
 }