huwhois 3 years ago
parent
commit
584f09999b

+ 14 - 7
src/main/java/io/renren/modules/app/controller/AppAttendersController.java

@ -7,10 +7,14 @@ import io.renren.modules.admin.entity.AttendersviewEntity;
7 7
import io.renren.modules.admin.entity.MemberEntity;
8 8
import io.renren.modules.admin.service.AttendersService;
9 9
import io.renren.modules.admin.service.AttendersviewService;
10
import io.renren.modules.admin.service.MeetingService;
10 11
import io.renren.modules.admin.service.MemberService;
12
import io.renren.modules.admin.service.SignService;
13
import io.renren.modules.admin.service.SignviewService;
11 14
import io.renren.modules.app.annotation.Login;
12 15
import io.renren.modules.app.service.SmsCodeService;
13 16
import io.renren.modules.admin.entity.HotalEntity;
17
import io.renren.modules.admin.entity.MeetingEntity;
14 18
15 19
import java.util.Date;
16 20
@ -34,6 +38,10 @@ public class AppAttendersController {
34 38
    private AttendersviewService attendersviewService;
35 39
    @Autowired
36 40
    private SmsCodeService smsCodeService;
41
    @Autowired
42
    private MeetingService meetingService;
43
    @Autowired
44
    private SignviewService signviewService;
37 45
38 46
    @GetMapping("notToken")
39 47
    public R notToken() {
@ -109,11 +117,12 @@ public class AppAttendersController {
109 117
        return R.ok();
110 118
    }
111 119
112
    @GetMapping("/infobysymbol/{token}")
113
    public R notToken(@PathVariable("symbol") String symbol){
114
        // AttendersviewEntity attenders = attendersviewService.getBySymbol(token);
115
        // return R.ok().put("attenders", attenders);
116
        return null;
120
    @GetMapping("/attenderinfo/{mid}/{symbol}")
121
    public R notToken(@PathVariable("mid") Long mid, @PathVariable("symbol") String symbol){
122
        AttendersviewEntity attenders = attendersviewService.getBySymbolAndMid(symbol, mid);
123
        
124
        MeetingEntity meeting = meetingService.getById(mid);
125
        return R.ok().put("attenders", attenders).put("meeting", meeting);
117 126
    }
118 127
119 128
    @Login
@ -151,6 +160,4 @@ public class AppAttendersController {
151 160
152 161
        return R.ok();
153 162
    }
154
155
156 163
}