huwhois 4 years ago
parent
commit
b76fda7ba6

+ 5 - 10
src/main/java/io/renren/modules/admin/controller/MeetingController.java

91
    }
91
    }
92
92
93
    /**
93
    /**
94
     * 列表
94
     * 分会列表
95
     */
95
     */
96
    @GetMapping("/listbranch")
96
    @GetMapping("/listbranch/{mid}")
97
    @RequiresPermissions("admin:meeting:list")
97
    @RequiresPermissions("admin:meeting:list")
98
    public R listBranch(@RequestParam Map<String, Object> params){
99
        if (!params.containsKey("meetingId")){
100
            return R.error("会议id不能为空");
101
        }
102
        
103
        PageUtils page = meetingService.queryPage(params);
104
105
        return R.ok().put("page", page);
98
    public R listBranch(@PathVariable("mid") Long mid){
99
        List<MeetingEntity> list= meetingService.listByPid(mid);
100
        return R.ok().put("list", list);
106
    }
101
    }
107
102
108
    /**
103
    /**

+ 31 - 10
src/main/java/io/renren/modules/admin/controller/ReportController.java

63
    @GetMapping("/info/{aid}")
63
    @GetMapping("/info/{aid}")
64
    @RequiresPermissions("admin:report:info")
64
    @RequiresPermissions("admin:report:info")
65
    public R info(@PathVariable("aid") Long aid){
65
    public R info(@PathVariable("aid") Long aid){
66
		ReportEntity report = reportService.getById(aid);
66
        ReportEntity report = reportService.getById(aid);
67
67
68
        return R.ok().put("report", report);
68
        return R.ok().put("report", report);
69
    }
69
    }
70
70
71
    /**
71
    /**
72
     * 新增/修改
72
     * 新增
73
     * @param report
74
     * @return
75
     */
76
    @PostMapping("/save")
77
    @RequiresPermissions("admin:report:update")
78
    public R save(@RequestBody ReportEntity report){
79
        AttendersEntity attenders = attendersService.getById(report.getAid());
80
        if (attenders==null) {
81
            return R.error("参会人员不存在");
82
        }
83
        attenders.setIsReport(1);
84
        attenders.setReportTitle(report.getTitle());
85
        attendersService.updateById(attenders);
86
87
        ScheduleEntity schedule = new ScheduleEntity();
88
        schedule.setAttendersId(report.getAid());
89
        schedule.setBranchId(report.getBranchId());
90
        schedule.setSort(report.getSort());
91
        scheduleService.save(schedule);
92
        
93
        return R.ok();
94
    }
95
96
    /**
97
     * 修改
73
     */
98
     */
74
    @PostMapping("/update")
99
    @PostMapping("/update")
75
    @RequiresPermissions("admin:report:update")
100
    @RequiresPermissions("admin:report:update")
84
        attendersService.updateById(attenders);
109
        attendersService.updateById(attenders);
85
110
86
        ScheduleEntity schedule = new ScheduleEntity();
111
        ScheduleEntity schedule = new ScheduleEntity();
112
        schedule.setAttendersId(report.getId());
87
        schedule.setAttendersId(report.getAid());
113
        schedule.setAttendersId(report.getAid());
88
        schedule.setBranchId(report.getBranchId());
114
        schedule.setBranchId(report.getBranchId());
89
        schedule.setSort(report.getSort());
115
        schedule.setSort(report.getSort());
90
        if (report.getId()==null || report.getId()==0L) {
91
            scheduleService.save(schedule);
92
        } else {
93
            schedule.setAttendersId(report.getId());
94
            scheduleService.updateById(schedule);
95
        }
116
        scheduleService.updateById(schedule);
96
        
117
        
97
        return R.ok();
118
        return R.ok();
98
    }
119
    }
103
    @PostMapping("/delete/{aid}")
124
    @PostMapping("/delete/{aid}")
104
    @RequiresPermissions("admin:report:delete")
125
    @RequiresPermissions("admin:report:delete")
105
    public R delete(@PathVariable("aid") Long aid){
126
    public R delete(@PathVariable("aid") Long aid){
106
		// reportService.removeByIds(Arrays.asList(aids));
127
        // reportService.removeByIds(Arrays.asList(aids));
107
        ReportEntity report = reportService.getById(aid);
128
        ReportEntity report = reportService.getById(aid);
108
        if (report!=null) {
129
        if (report!=null) {
109
            scheduleService.removeById(report.getId());
130
            scheduleService.removeById(report.getId());
124
        Long branchId = Long.valueOf(params.get("branchId").toString());
145
        Long branchId = Long.valueOf(params.get("branchId").toString());
125
        Long id = params.containsKey("id") ? Long.valueOf(params.get("id").toString()) : 0L;
146
        Long id = params.containsKey("id") ? Long.valueOf(params.get("id").toString()) : 0L;
126
147
127
		ScheduleEntity schedule = new ScheduleEntity();
148
        ScheduleEntity schedule = new ScheduleEntity();
128
        schedule.setAttendersId(aid);
149
        schedule.setAttendersId(aid);
129
        schedule.setBranchId(branchId);
150
        schedule.setBranchId(branchId);
130
        if (id==0L) {
151
        if (id==0L) {

+ 4 - 0
src/main/java/io/renren/modules/admin/entity/ReportEntity.java

68
	 * 电话
68
	 * 电话
69
	 */
69
	 */
70
	private String phone;
70
	private String phone;
71
	/**
72
	 * 分会场名称
73
	 */
74
	private String branchName;
71
75
72
}
76
}

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

21
    boolean meetingExist(Long id);
21
    boolean meetingExist(Long id);
22
22
23
	List<MeetingEntity> listByPid(Long pid);
23
	List<MeetingEntity> listByPid(Long pid);
24
25
	PageUtils branchAll(Long meetingId);
24
}
26
}
25
27

+ 5 - 0
src/main/java/io/renren/modules/admin/service/impl/MeetingServiceImpl.java

41
        return this.list(new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq("pid", pid));
41
        return this.list(new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq("pid", pid));
42
    }
42
    }
43
43
44
    @Override
45
    public PageUtils branchAll(Long meetingId) {
46
        return null;
47
    }
48
44
}
49
}

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

48
    public void validate(String uuid, String code, String phone)  throws RRException{
48
    public void validate(String uuid, String code, String phone)  throws RRException{
49
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
49
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
50
        if (smsCodeEntity == null) {
50
        if (smsCodeEntity == null) {
51
            throw new RRException("验证码不正确1");
51
            throw new RRException("验证码不正确");
52
        }
52
        }
53
53
54
        if (smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone)
54
        if (smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone)
56
            // 删除验证码
56
            // 删除验证码
57
            this.removeById(uuid);
57
            this.removeById(uuid);
58
        } else {
58
        } else {
59
            throw new RRException("验证码不正确2");
59
            throw new RRException("验证码不正确");
60
        }
60
        }
61
    }
61
    }
62
}
62
}