huwhois 4 lat temu
rodzic
commit
b07238e2c0

+ 56 - 0
src/main/java/io/renren/modules/app/controller/AppMeetingController.java

1
package io.renren.modules.app.controller;
2
3
import java.util.List;
4
5
import org.springframework.beans.factory.annotation.Autowired;
6
import org.springframework.web.bind.annotation.GetMapping;
7
import org.springframework.web.bind.annotation.PathVariable;
8
import org.springframework.web.bind.annotation.RequestMapping;
9
import org.springframework.web.bind.annotation.RestController;
10
11
import io.renren.modules.admin.entity.MeetingEntity;
12
import io.renren.modules.admin.service.MeetingService;
13
import io.renren.common.utils.R;
14
15
/**
16
 * 会议表
17
 *
18
 * @author huwhois
19
 * @email huwhois@163.com
20
 * @date 2020-12-09 14:33:56
21
 */
22
@RestController
23
@RequestMapping("app/meeting")
24
public class AppMeetingController {
25
    @Autowired
26
    private MeetingService meetingService;
27
28
    /**
29
     * 列表
30
     */
31
    @GetMapping("/list")
32
    public R list(){
33
        List<MeetingEntity> list= meetingService.listByPid(0L);
34
        return R.ok().put("list", list);
35
    }
36
37
    /**
38
     * 信息
39
     */
40
    @GetMapping("/info/{id}")
41
    public R info(@PathVariable("id") Long id){
42
        MeetingEntity meeting = meetingService.getById(id);
43
44
        return R.ok().put("meeting", meeting);
45
    }
46
47
    /**
48
     * 分会列表
49
     */
50
    @GetMapping("/listbranch/{mid}")
51
    public R listBranch(@PathVariable("mid") Long mid){
52
        List<MeetingEntity> list= meetingService.listByPid(mid);
53
        return R.ok().put("list", list);
54
    }
55
56
}

+ 1 - 12
src/main/java/io/renren/modules/app/controller/AppReportController.java

1
package io.renren.modules.app.controller;
1
package io.renren.modules.app.controller;
2
2
3
import java.util.List;
3
import java.util.List;
4
import java.util.Map;
5
6
import org.apache.shiro.authz.annotation.RequiresPermissions;
7
import org.springframework.beans.factory.annotation.Autowired;
4
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.web.bind.annotation.GetMapping;
5
import org.springframework.web.bind.annotation.GetMapping;
9
import org.springframework.web.bind.annotation.PathVariable;
6
import org.springframework.web.bind.annotation.PathVariable;
10
import org.springframework.web.bind.annotation.PostMapping;
11
import org.springframework.web.bind.annotation.RequestBody;
12
import org.springframework.web.bind.annotation.RequestMapping;
7
import org.springframework.web.bind.annotation.RequestMapping;
13
import org.springframework.web.bind.annotation.RequestParam;
14
import org.springframework.web.bind.annotation.RestController;
8
import org.springframework.web.bind.annotation.RestController;
15
9
16
import io.renren.modules.admin.entity.AttendersEntity;
17
import io.renren.modules.admin.entity.ReportEntity;
10
import io.renren.modules.admin.entity.ReportEntity;
18
import io.renren.modules.admin.service.AttendersService;
19
import io.renren.modules.admin.service.ReportService;
11
import io.renren.modules.admin.service.ReportService;
20
import io.renren.modules.admin.entity.ScheduleEntity;
21
import io.renren.modules.admin.service.ScheduleService;
22
import io.renren.common.utils.PageUtils;
23
import io.renren.common.utils.R;
12
import io.renren.common.utils.R;
24
13
25
14
48
    
37
    
49
    @GetMapping("/listbranch/{mid}")
38
    @GetMapping("/listbranch/{mid}")
50
    public R listByBranch(@PathVariable("mid") Long mid){
39
    public R listByBranch(@PathVariable("mid") Long mid){
51
        List<ReportEntity> list = reportService.listByBranch(mid, "bid");
40
        List<ReportEntity> list = reportService.listByBranch(mid, null);
52
41
53
        return R.ok().put("list", list);
42
        return R.ok().put("list", list);
54
    }
43
    }