|
@@ -16,6 +16,7 @@ import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeCouresServ
|
|
|
import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
|
|
import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
|
|
|
import com.zhongzheng.modules.activity.service.IActivityGradeService;
|
|
import com.zhongzheng.modules.activity.service.IActivityGradeService;
|
|
|
import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
|
|
import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
|
|
|
|
|
+import com.zhongzheng.modules.user.service.IUserService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -50,6 +51,9 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ActivityGradePrivilegeMapper activityGradePrivilegeMapper;
|
|
private ActivityGradePrivilegeMapper activityGradePrivilegeMapper;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private IUserService userService;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public ActivityGradeVo queryById(Long id){
|
|
public ActivityGradeVo queryById(Long id){
|
|
|
ActivityGrade db = this.baseMapper.selectById(id);
|
|
ActivityGrade db = this.baseMapper.selectById(id);
|
|
@@ -69,7 +73,12 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
|
|
|
lqw.orderByDesc(ActivityGrade::getUpdateTime);
|
|
lqw.orderByDesc(ActivityGrade::getUpdateTime);
|
|
|
List<ActivityGrade> list = this.list(lqw);
|
|
List<ActivityGrade> list = this.list(lqw);
|
|
|
List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
|
|
List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
|
|
|
- return entity2Vo(activityGradeVos);
|
|
|
|
|
|
|
+ List<ActivityGradeVo> activityGradeVos1 = entity2Vo(activityGradeVos);
|
|
|
|
|
+ for (ActivityGradeVo activityGradeVo : activityGradeVos1) {
|
|
|
|
|
+ Integer num = userService.selectUserNum(activityGradeVo.getGrade());
|
|
|
|
|
+ activityGradeVo.setUserNum(num);
|
|
|
|
|
+ }
|
|
|
|
|
+ return activityGradeVos1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|