huwhois 4 years ago
parent
commit
7d06ee5ae3

+ 12 - 2
src/main/java/io/renren/modules/admin/controller/MeetingController.java

6
import io.renren.modules.admin.entity.MeetingEntity;
6
import io.renren.modules.admin.entity.MeetingEntity;
7
import io.renren.modules.admin.entity.SubjectEntity;
7
import io.renren.modules.admin.entity.SubjectEntity;
8
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
8
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
9
import io.renren.modules.admin.entity.EmployeeEntity;
9
import io.renren.modules.admin.form.MeetingForm;
10
import io.renren.modules.admin.form.MeetingForm;
10
import io.renren.modules.admin.service.IndustryService;
11
import io.renren.modules.admin.service.IndustryService;
11
import io.renren.modules.admin.service.MeetingService;
12
import io.renren.modules.admin.service.MeetingService;
12
import io.renren.modules.admin.service.SubjectService;
13
import io.renren.modules.admin.service.SubjectService;
13
import io.renren.modules.admin.service.TypesOfAttendersService;
14
import io.renren.modules.admin.service.TypesOfAttendersService;
15
import io.renren.modules.admin.service.EmployeeService;
14

16

15
import org.apache.commons.lang.StringUtils;
17
import org.apache.commons.lang.StringUtils;
16
import org.apache.shiro.authz.annotation.RequiresPermissions;
18
import org.apache.shiro.authz.annotation.RequiresPermissions;
49
    @Autowired
51
    @Autowired
50
    private TypesOfAttendersService typesOfAttendersService;
52
    private TypesOfAttendersService typesOfAttendersService;
51

53

52

54
@Autowired
55
    private EmployeeService employeeService;
53
    /**
56
    /**
54
     * 列表
57
     * 列表
55
     */
58
     */
82
    @RequiresPermissions("admin:meeting:info")
85
    @RequiresPermissions("admin:meeting:info")
83
    public R info(@PathVariable("id") Long id){
86
    public R info(@PathVariable("id") Long id){
84
		MeetingEntity meeting = meetingService.getById(id);
87
		MeetingEntity meeting = meetingService.getById(id);
85

88
        Long sId = meeting.getServiceId();
89
        if (sId == null || sId == 0) {
90
              meeting.setServiceName("");
91
        } else{
92
            EmployeeEntity employee = employeeService.getById(sId);
93
            meeting.setServiceName(employee.getTruename());
94
        }
95
        
86
        return R.ok().put("meeting", meeting);
96
        return R.ok().put("meeting", meeting);
87
    }
97
    }
88

98