..

src/main/java/io/renren/modules/admin/controller/ReportController.java

@@ -167,10 +167,18 @@ public class ReportController {
        return R.ok().put("list", list);
    }
    @GetMapping("/listbranch/{mid}/{bid}")
    @RequiresPermissions("admin:report:list")
    public R listByBranch(@PathVariable("mid") Long mid, @PathVariable("bid") Long bid){
        List<ReportEntity> list = reportService.listByBranch(mid, bid, null);
        return R.ok().put("list", list);
    }
    @GetMapping("/listbranch/{mid}")
    @RequiresPermissions("admin:report:list")
    public R listByBranch(@PathVariable("mid") Long mid){
        List<ReportEntity> list = reportService.listByBranch(mid);
        List<ReportEntity> list = reportService.listByBranch(mid, null);
        return R.ok().put("list", list);
    }

src/main/java/io/renren/modules/admin/service/ReportService.java

@@ -19,7 +19,8 @@ public interface ReportService extends IService<ReportEntity> {
    PageUtils queryPage(Map<String, Object> params);
	List<ReportEntity> listByBranch(Long mid, Long bid, String order);
	
	List<ReportEntity> listByBranch(Long mid, String order);
	List<ReportEntity> listByBranch(Long mid);
}

src/main/java/io/renren/modules/admin/service/impl/ReportServiceImpl.java

@@ -37,8 +37,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity> impl
    }
    @Override
    public List<ReportEntity> listByBranch(Long mid) {
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid));
    public List<ReportEntity> listByBranch(Long mid, String order) {
        return this.list(new QueryWrapper<ReportEntity>().eq("meeting_id", mid).orderByAsc(StringUtils.isNotBlank(order), order));
    }
}

src/main/java/io/renren/modules/app/controller/AppReportController.java

@@ -0,0 +1,67 @@
package io.renren.modules.app.controller;
import java.util.List;
import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.entity.ReportEntity;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.ReportService;
import io.renren.modules.admin.entity.ScheduleEntity;
import io.renren.modules.admin.service.ScheduleService;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
/**
 * 报告管理
 *
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:27:09
 */
@RestController
@RequestMapping("app/report")
public class AppReportController {
    @Autowired
    private ReportService reportService;
    /**
     * 分会场列表
     */
    @GetMapping("/listbranch/{mid}/{bid}")
    public R listByBranch(@PathVariable("mid") Long mid, @PathVariable("bid") Long bid){
        List<ReportEntity> list = reportService.listByBranch(mid, bid, "start_time");
        return R.ok().put("list", list);
    }
    
    @GetMapping("/listbranch/{mid}")
    public R listByBranch(@PathVariable("mid") Long mid){
        List<ReportEntity> list = reportService.listByBranch(mid, "bid");
        return R.ok().put("list", list);
    }
    /**
     * 信息
     */
    @GetMapping("/info/{aid}")
    public R info(@PathVariable("aid") Long aid){
        ReportEntity report = reportService.getById(aid);
        return R.ok().put("report", report);
    }
}