huwhois 5 years ago
parent
commit
a7ab9f0fd1

+ 5 - 2
src/main/java/io/renren/modules/admin/controller/AttendersController.java

@ -48,10 +48,13 @@ public class AttendersController extends AbstractController  {
48 48
    /**
49 49
     * 列表
50 50
     */
51
    @RequestMapping("/list")
51
    @GetMapping("/list")
52 52
    @RequiresPermissions("admin:attenders:list")
53 53
    public R list(@RequestParam Map<String, Object> params) {
54
        PageUtils page = attendersService.queryPage(params);
54
        if (!params.containsKey("meetingId")) {
55
            return R.error("会议id不可为空");
56
        }
57
        PageUtils page = attendersService.myQueryPage(params);
55 58
        
56 59
        return R.ok().put("page", page);
57 60
    }

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

@ -19,11 +19,11 @@ import org.apache.ibatis.annotations.Update;
19 19
 */
20 20
@Mapper
21 21
public interface AttendersDao extends BaseMapper<AttendersEntity> {
22
    // @Select("SELECT a.id, m.truename, m.organization, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_ispay FROM  payment p WHERE p.attenders.id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND () limit #{page},#{limit};")
23
    // List<Map<String, Object>> getMapList(Long meetingId, String truename, String organization, String servicerName, int page, int limit);
22
    @Select("SELECT a.id, m.truename as name, m.organization, m.phone, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id as typeId, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_pay FROM  payment p WHERE p.attenders_id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%') limit #{page},#{limit};")
23
    List<Map<String, Object>> getMapList(Long meetingId, String truename, String organization, int page, int limit);
24 24

25
    // @Select("SELECT count(*) ")
26
    // int getCounts(Long meetingId, String truename, String organization, String servicerName);
25
    @Select("SELECT count(*) FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%');")
26
    int getCounts(Long meetingId, String truename, String organization);
27 27

28 28
    @Select("SELECT a.id, m.truename, m.organization, m.position, m.job_title as jobTitle, m.phone, m.email, (select t.name from types_of_attenders t where t.id=a.type_id) as typeName, (SELECT p.is_ispay FROM  payment p WHERE p.attenders.id=a.id) as isPay  FROM attenders a JOIN member m ON a.member_id=m.id WHERE a.is_del=0 AND a.meeting_id=#{meetingId}")
29 29
    List<Map<String, Object>> getMapList(Long meetingId);

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

@ -18,6 +18,8 @@ public interface AttendersService extends IService<AttendersEntity> {
18 18

19 19
    PageUtils queryPage(Map<String, Object> params);
20 20

21
    PageUtils myQueryPage(Map<String, Object> params);
22

21 23
    /**
22 24
     * 根据会员id 查询最近参会列表
23 25
     * @param memberId

+ 15 - 22
src/main/java/io/renren/modules/admin/service/impl/AttendersServiceImpl.java

@ -22,40 +22,33 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
22 22

23 23
    @Override
24 24
    public PageUtils queryPage(Map<String, Object> params) {
25
        Long meetingId = Long.valueOf((String) params.get("meetingId"));
25 26
        String name = (String) params.get("name");
26 27
        IPage<AttendersEntity> page = this.page(
27 28
                new Query<AttendersEntity>().getPage(params),
28 29
                new QueryWrapper<AttendersEntity>()
30
                .eq("meeting_id", meetingId)
29 31
                .like(StringUtils.isNotBlank(name),"name",name)
30 32
        );
31 33

32
        List<AttendersEntity> theList = page.getRecords();
33
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
34
        for (AttendersEntity attenders : theList) {
35
            Map<String, Object> map = new HashMap<String, Object>();
36
            Long aid = attenders.getId();
37
            map.put("id", aid);
38
            map.put("id", aid);
39
            map.put("id", aid);
40
            map.put("id", aid);
41
            map.put("id", aid);
42
            map.put("id", aid);
43
            map.put("id", aid);
44
        }
45

46

47 34
        return new PageUtils(page);
48 35
    }
49 36

50
    // @Override
51
    // public PageUtils myQueryPage(Map<String, Object> params) {
52
        
53
    //     List<Map<String, Object>> list = baseMapper.getMapList();
54

37
    @Override
38
    public PageUtils myQueryPage(Map<String, Object> params) {
39
        Long meetingId = Long.valueOf((String) params.get("meetingId"));
40
        String key = (String) params.get("key");
41
        int page = params.containsKey("page") ? Integer.valueOf((String) params.get("page")) - 1 : 0;
42
        if (page < 0) {
43
            page = 0;
44
        }
45
        int limit = params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
55 46

47
        List<Map<String, Object>> list = baseMapper.getMapList(meetingId, key, key, page, limit);
48
        int total = baseMapper.getCounts(meetingId, key, key);
56 49

57
    //     return new PageUtils();
58
    // }
50
        return new PageUtils(list, total, limit, page);
51
    }
59 52

60 53
    @Override
61 54
    public List<Map<String, Object>> getMeetingListByMemberId(Long memberId){