huwhois лет назад: 5
Родитель
Сommit
7975ae2200

+ 8 - 3
src/main/java/io/renren/modules/admin/controller/LectureController.java

@ -3,6 +3,7 @@ package io.renren.modules.admin.controller;
3 3
import java.util.Arrays;
4 4
import java.util.Map;
5 5
6
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl.On;
6 7
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
7 8
8 9
import java.util.Date;
@ -18,7 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
18 19
import org.springframework.web.bind.annotation.RequestParam;
19 20
import org.springframework.web.bind.annotation.RestController;
20 21
22
import io.renren.modules.admin.entity.AttendersEntity;
21 23
import io.renren.modules.admin.entity.LectureEntity;
24
import io.renren.modules.admin.service.AttendersService;
22 25
import io.renren.modules.admin.service.LectureService;
23 26
import io.renren.common.utils.PageUtils;
24 27
import io.renren.common.utils.R;
@ -35,7 +38,8 @@ import io.renren.common.utils.R;
35 38
public class LectureController {
36 39
    @Autowired
37 40
    private LectureService lectureService;
38
41
    @Autowired
42
    private AttendersService attendersService;
39 43
    /**
40 44
     * 列表
41 45
     */
@ -65,8 +69,9 @@ public class LectureController {
65 69
    @RequiresPermissions("admin:lecture:info")
66 70
    public R info(@PathVariable("id") Long id) {
67 71
        LectureEntity lecture = lectureService.getById(id);
68
69
        return R.ok().put("lecture", lecture);
72
        Long aId = lecture.getAttendersId();
73
        Map<String, Object> aEntity = attendersService.getNameById(aId);
74
        return R.ok().put("lecture", lecture).put("attenders", aEntity);
70 75
    }
71 76
72 77
    /**

+ 3 - 0
src/main/java/io/renren/modules/admin/dao/AttendersDao.java

@ -20,4 +20,7 @@ import org.apache.ibatis.annotations.Select;
20 20
public interface AttendersDao extends BaseMapper<AttendersEntity> {
21 21
    @Select("SELECT a.id as aid,a.meeting_id,m.name_cn FROM attenders a JOIN meeting m ON a.meeting_id=m.id WHERE a.member_id=#{memberId} ORDER BY a.id;")
22 22
    List<Map<String, Object>> getMeetingListByMemberId(Long memberId);
23

24
    @Select("SELECT a.id, m.truename as name FROM attenders a JOIN member m ON a.member_id=m.id where a.is_del=0 AND a.id=#{aid}")
25
    Map<String, Object> getNameById(Long aid);
23 26
}

+ 7 - 0
src/main/java/io/renren/modules/admin/service/AttendersService.java

@ -24,5 +24,12 @@ public interface AttendersService extends IService<AttendersEntity> {
24 24
     * @return
25 25
     */
26 26
    List<Map<String, Object>> getMeetingListByMemberId(Long memberId);
27

28
    /**
29
     * 根据参会人员id 查询姓名
30
     * @param aid
31
     * @return
32
     */
33
    Map<String, Object> getNameById(Long aid);
27 34
}
28 35


+ 5 - 0
src/main/java/io/renren/modules/admin/service/impl/AttendersServiceImpl.java

@ -35,4 +35,9 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
35 35
    public List<Map<String, Object>> getMeetingListByMemberId(Long memberId){
36 36
        return baseMapper.getMeetingListByMemberId(memberId);
37 37
    }
38

39
    @Override
40
    public Map<String, Object> getNameById(Long aid) {
41
        return baseMapper.getNameById(aid);
42
    }
38 43
}