update

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

@@ -8,18 +8,6 @@ public class ActivityStudentAdjustDto {
 
     private Integer giveCourseNum = 0;
 
-    private Integer activityId;
-
-    private String memo;
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
     public Integer getUserId() {
         return userId;
     }
@@ -44,11 +32,4 @@ public class ActivityStudentAdjustDto {
         this.giveCourseNum = giveCourseNum;
     }
 
-    public Integer getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Integer activityId) {
-        this.activityId = activityId;
-    }
 }

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

@@ -114,7 +114,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		if(activity == null){
 			throw new BizException("活动信息不存在");
 		}
-		if(activity.getActivityType() != 1){
+		if(activity.getActivityType() != 0){
 			throw new BizException("操作失败:只有课程活动支持此操作");
 		}
 		List<Integer> studentIds = activityStudentAdjustDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
@@ -174,7 +174,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 		ActivityUserMapper activityUserMapper = activityUserMapperDao.get(activityUserMapperId);
 		if(activityUserMapper.getVipFlag() == 2 ||
 				activityUserMapper.getGiveVipFlag() == 2 ||
-				activityUserMapper.getPracticeGroupId() == 2 ||
+				activityUserMapper.getPracticeFlag() == 2 ||
 				activityUserMapper.getGivePracticeFlag() == 2 || activityUserMapper.getReturnFee()){
 			throw new BizException("操作失败：活动已消耗");
 		}

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

@@ -165,13 +165,30 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ActivityUserMapper" parameterType="map">
-		SELECT * FROM activity_user_mapper ORDER BY id_
+		SELECT * FROM activity_user_mapper
+		<where>
+			<if test="userId != null">
+				AND user_id_ = #{userId}
+			</if>
+			<if test="activityId != null">
+				AND activity_id_ = #{activityId}
+			</if>
+		</where>
+		ORDER BY id_
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM activity_user_mapper
+		<where>
+			<if test="userId != null">
+				AND user_id_ = #{userId}
+			</if>
+			<if test="activityId != null">
+				AND activity_id_ = #{activityId}
+			</if>
+		</where>
 	</select>
     <select id="findByStudentIdList" resultMap="ActivityUserMapper">
 		SELECT * FROM activity_user_mapper

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

@@ -1,6 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.dto.ActivityStudentAdjustDto;
 import com.ym.mec.biz.dal.dto.ActivityUserMapperAddDto;
 import com.ym.mec.biz.dal.page.ActivityStudentQueryInfo;
 import com.ym.mec.biz.service.ActivityUserMapperService;
@@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Api(tags = "学员活动排课记录服务")
 @RequestMapping("activityUserMapper")
@@ -47,4 +45,11 @@ public class ActivityUserMapperController extends BaseController {
     public Object queryActivityUserMapper(ActivityStudentQueryInfo queryInfo){
         return succeed(activityUserMapperService.queryActivityUserMapper(queryInfo));
     }
+
+    @ApiOperation(value = "获取列表")
+    @RequestMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('activityUserMapper/queryPage')")
+    public Object queryPage(ActivityStudentQueryInfo queryInfo){
+        return succeed(activityUserMapperService.queryPage(queryInfo));
+    }
 }