..

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

@@ -91,18 +91,13 @@ public class MeetingController {
    }
    /**
     * 列表
     * 分会列表
     */
    @GetMapping("/listbranch")
    @GetMapping("/listbranch/{mid}")
    @RequiresPermissions("admin:meeting:list")
    public R listBranch(@RequestParam Map<String, Object> params){
        if (!params.containsKey("meetingId")){
            return R.error("会议id不能为空");
        }
        
        PageUtils page = meetingService.queryPage(params);
        return R.ok().put("page", page);
    public R listBranch(@PathVariable("mid") Long mid){
        List<MeetingEntity> list= meetingService.listByPid(mid);
        return R.ok().put("list", list);
    }
    /**

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

@@ -63,13 +63,38 @@ public class ReportController {
    @GetMapping("/info/{aid}")
    @RequiresPermissions("admin:report:info")
    public R info(@PathVariable("aid") Long aid){
		ReportEntity report = reportService.getById(aid);
        ReportEntity report = reportService.getById(aid);
        return R.ok().put("report", report);
    }
    /**
     * 新增/修改
     * 新增
     * @param report
     * @return
     */
    @PostMapping("/save")
    @RequiresPermissions("admin:report:update")
    public R save(@RequestBody ReportEntity report){
        AttendersEntity attenders = attendersService.getById(report.getAid());
        if (attenders==null) {
            return R.error("参会人员不存在");
        }
        attenders.setIsReport(1);
        attenders.setReportTitle(report.getTitle());
        attendersService.updateById(attenders);
        ScheduleEntity schedule = new ScheduleEntity();
        schedule.setAttendersId(report.getAid());
        schedule.setBranchId(report.getBranchId());
        schedule.setSort(report.getSort());
        scheduleService.save(schedule);
        
        return R.ok();
    }
    /**
     * 修改
     */
    @PostMapping("/update")
    @RequiresPermissions("admin:report:update")
@@ -84,15 +109,11 @@ public class ReportController {
        attendersService.updateById(attenders);
        ScheduleEntity schedule = new ScheduleEntity();
        schedule.setAttendersId(report.getId());
        schedule.setAttendersId(report.getAid());
        schedule.setBranchId(report.getBranchId());
        schedule.setSort(report.getSort());
        if (report.getId()==null || report.getId()==0L) {
            scheduleService.save(schedule);
        } else {
            schedule.setAttendersId(report.getId());
            scheduleService.updateById(schedule);
        }
        scheduleService.updateById(schedule);
        
        return R.ok();
    }
@@ -103,7 +124,7 @@ public class ReportController {
    @PostMapping("/delete/{aid}")
    @RequiresPermissions("admin:report:delete")
    public R delete(@PathVariable("aid") Long aid){
		// reportService.removeByIds(Arrays.asList(aids));
        // reportService.removeByIds(Arrays.asList(aids));
        ReportEntity report = reportService.getById(aid);
        if (report!=null) {
            scheduleService.removeById(report.getId());
@@ -124,7 +145,7 @@ public class ReportController {
        Long branchId = Long.valueOf(params.get("branchId").toString());
        Long id = params.containsKey("id") ? Long.valueOf(params.get("id").toString()) : 0L;
		ScheduleEntity schedule = new ScheduleEntity();
        ScheduleEntity schedule = new ScheduleEntity();
        schedule.setAttendersId(aid);
        schedule.setBranchId(branchId);
        if (id==0L) {

src/main/java/io/renren/modules/admin/entity/ReportEntity.java

@@ -68,5 +68,9 @@ public class ReportEntity implements Serializable {
	 * 电话
	 */
	private String phone;
	/**
	 * 分会场名称
	 */
	private String branchName;
}

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

@@ -21,5 +21,7 @@ public interface MeetingService extends IService<MeetingEntity> {
    boolean meetingExist(Long id);
	List<MeetingEntity> listByPid(Long pid);
	PageUtils branchAll(Long meetingId);
}

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

@@ -41,4 +41,9 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
        return this.list(new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq("pid", pid));
    }
    @Override
    public PageUtils branchAll(Long meetingId) {
        return null;
    }
}

src/main/java/io/renren/modules/app/service/impl/SmsCodeServiceImpl.java

@@ -48,7 +48,7 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
    public void validate(String uuid, String code, String phone)  throws RRException{
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
        if (smsCodeEntity == null) {
            throw new RRException("验证码不正确1");
            throw new RRException("验证码不正确");
        }
        if (smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone)
@@ -56,7 +56,7 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
            // 删除验证码
            this.removeById(uuid);
        } else {
            throw new RRException("验证码不正确2");
            throw new RRException("验证码不正确");
        }
    }
}