huwhois 5 vuotta sitten
vanhempi
commit
2b84b1d9f8

+ 53 - 11
src/main/java/io/renren/modules/admin/controller/MeetingController.java

@ -1,25 +1,26 @@
1 1
package io.renren.modules.admin.controller;
2 2

3
import java.util.Arrays;
4
import java.util.Map;
5
import java.util.Date;
6

3
import io.renren.common.utils.PageUtils;
4
import io.renren.common.utils.R;
7 5
import io.renren.modules.admin.entity.IndustryEntity;
6
import io.renren.modules.admin.entity.MeetingEntity;
8 7
import io.renren.modules.admin.entity.SubjectEntity;
9 8
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
10
import io.renren.modules.admin.service.*;
9
import io.renren.modules.admin.service.IndustryService;
10
import io.renren.modules.admin.service.MeetingService;
11
import io.renren.modules.admin.service.SubjectService;
12
import io.renren.modules.admin.service.TypesOfAttendersService;
11 13
import org.apache.shiro.authz.annotation.RequiresPermissions;
12 14
import org.springframework.beans.factory.annotation.Autowired;
13 15
import org.springframework.web.bind.annotation.PathVariable;
16
import org.springframework.web.bind.annotation.PostMapping;
14 17
import org.springframework.web.bind.annotation.RequestBody;
15 18
import org.springframework.web.bind.annotation.RequestMapping;
16
import org.springframework.web.bind.annotation.PostMapping;
17 19
import org.springframework.web.bind.annotation.RequestParam;
18 20
import org.springframework.web.bind.annotation.RestController;
19 21

20
import io.renren.modules.admin.entity.MeetingEntity;
21
import io.renren.common.utils.PageUtils;
22
import io.renren.common.utils.R;
22
import java.util.Date;
23
import java.util.Map;
23 24

24 25
/**
25 26
 * 会议表
@ -114,8 +115,7 @@ public class MeetingController {
114 115
        }
115 116

116 117
        meeting.setCreateTime(new Date());
117
		meetingService.save(meeting);
118

118
        meetingService.save(meeting);
119 119
        Long meetingid = meeting.getId();
120 120

121 121
        String[] attenderType = attendersType.split(",");
@ -130,6 +130,8 @@ public class MeetingController {
130 130
            }
131 131
        }
132 132

133

134

133 135
        return R.ok();
134 136
    }
135 137

@ -139,6 +141,46 @@ public class MeetingController {
139 141
    @RequestMapping("/update")
140 142
    @RequiresPermissions("admin:meeting:update")
141 143
    public R update(@RequestBody MeetingEntity meeting){
144

145
        String subjects = meeting.getSubjects();
146
        String industries = meeting.getIndustries();
147
        String attendersType = meeting.getAttendersType();
148
        Long meetingid = meeting.getId();
149
        System.out.println("会议id"+meetingid);
150

151
        String[] subject = subjects.split(",");
152
        for (String s : subject) {
153
            int i = subjectService.selectIsName(s);
154
            if(i==0){
155
                SubjectEntity se = new SubjectEntity();
156
                se.setName(s);
157
                se.setCreateTime(new Date());
158
                subjectService.save(se);
159
            }
160
        }
161
        String[] industry = industries.split(",");
162
        for (String s : industry) {
163
            int i = industryService.selectIsName(s);
164
            if(i==0){
165
                IndustryEntity in = new IndustryEntity();
166
                in.setName(s);
167
                in.setCreateTime(new Date());
168
                industryService.save(in);
169
            }
170
        }
171

172
        String[] attenderType = attendersType.split(",");
173
        for (String s : attenderType) {
174
            int i = typesOfAttendersService.selectIsnameAndId(s, meetingid);
175
            if(i==0) {
176
                TypesOfAttendersEntity typesOfAttenders = new TypesOfAttendersEntity();
177
                typesOfAttenders.setMeetingId(meetingid);
178
                typesOfAttenders.setName(s);
179
                typesOfAttenders.setCreateTime(new Date());
180
                typesOfAttendersService.save(typesOfAttenders);
181
            }
182
        }
183

142 184
        meeting.setModifyTime(new Date());
143 185
		meetingService.updateById(meeting);
144 186


+ 2 - 1
src/main/java/io/renren/modules/admin/dao/TypesOfAttendersDao.java

@ -3,6 +3,7 @@ package io.renren.modules.admin.dao;
3 3
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
4 4
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 5
import org.apache.ibatis.annotations.Mapper;
6
import org.apache.ibatis.annotations.Param;
6 7
import org.apache.ibatis.annotations.Select;
7 8

8 9
import java.util.List;
@ -28,5 +29,5 @@ public interface TypesOfAttendersDao extends BaseMapper<TypesOfAttendersEntity>
28 29
     * @return
29 30
     */
30 31
    @Select("select case when EXISTS (select * from types_of_attenders where name = '${name}' and meeting_id = '${meetingId}' ) then 1 else 0 end as result")
31
    int selectIsnameAndId(String name,Long meetingId);
32
    int selectIsnameAndId(@Param("name") String name, @Param("meetingId") Long meetingId);
32 33
}

+ 1 - 1
src/main/java/io/renren/modules/admin/service/impl/TypesOfAttendersServiceImpl.java

@ -44,7 +44,7 @@ public class TypesOfAttendersServiceImpl extends ServiceImpl<TypesOfAttendersDao
44 44

45 45
    @Override
46 46
    public int selectIsnameAndId(String name, Long meetingId) {
47
        return baseMapper.selectIsnameAndId(name,meetingId);
47
        return baseMapper.selectIsnameAndId(name, meetingId);
48 48
    }
49 49

50 50
}

+ 2 - 1
src/main/java/io/renren/modules/app/controller/OrderController.java

@ -74,8 +74,9 @@ public class OrderController {
74 74
        AttendersEntity attendersEntity = new AttendersEntity();
75 75
        attendersEntity.setMeetingId(meetingId);
76 76
        attendersEntity.setMemberId(user.getUserId());
77
        attendersEntity.setName(user.getUsername());
77
        attendersEntity.setName(user.getTruename());
78 78
        attendersEntity.setPhone(user.getPhone());
79
        attendersEntity.setOrganization(user.getOrganization());
79 80
        attendersEntity.setEmail(user.getEmail());
80 81
        Integer room = params.containsKey("room") ? Integer.valueOf(params.get("room").toString()) : 0 ;
81 82
        attendersEntity.setRoom(room);