|
|
@ -8,7 +8,7 @@ import io.renren.modules.admin.entity.SubjectEntity;
|
|
8
|
8
|
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
|
|
9
|
9
|
import io.renren.modules.admin.entity.EmployeeEntity;
|
|
10
|
10
|
import io.renren.modules.admin.form.MeetingForm;
|
|
11
|
|
import io.renren.modules.admin.form.TitlePicture;
|
|
|
11
|
import io.renren.modules.admin.form.TitlePictureForm;
|
|
12
|
12
|
import io.renren.modules.admin.service.IndustryService;
|
|
13
|
13
|
import io.renren.modules.admin.service.MeetingService;
|
|
14
|
14
|
import io.renren.modules.admin.service.SubjectService;
|
|
|
@ -83,18 +83,20 @@ public class MeetingController {
|
|
83
|
83
|
Date[] startAndEndTime = new Date[2];
|
|
84
|
84
|
startAndEndTime[0] = meeting.getStartTime();
|
|
85
|
85
|
startAndEndTime[1] = meeting.getEndTime();
|
|
86
|
|
ArrayList <TitlePicture> arlist = new ArrayList <TitlePicture>();
|
|
|
86
|
ArrayList <TitlePictureForm> arlist = new ArrayList <TitlePictureForm>();
|
|
87
|
87
|
if (meeting.getTitlePicture().indexOf(",") != -1) {
|
|
88
|
88
|
String[] arr = meeting.getTitlePicture().split(",");
|
|
|
89
|
int i = 0;
|
|
89
|
90
|
for (String string : arr) {
|
|
90
|
|
TitlePicture tip = new TitlePicture();
|
|
|
91
|
i++;
|
|
|
92
|
TitlePictureForm tip = new TitlePictureForm();
|
|
91
|
93
|
tip.setStatus("success");
|
|
92
|
|
tip.setUid(new Date().getTime());
|
|
|
94
|
tip.setUid((new Date().getTime())+i);
|
|
93
|
95
|
tip.setUrl("http://192.168.3.233" + string);
|
|
94
|
96
|
arlist.add(tip);
|
|
95
|
97
|
}
|
|
96
|
98
|
} else {
|
|
97
|
|
TitlePicture tip = new TitlePicture();
|
|
|
99
|
TitlePictureForm tip = new TitlePictureForm();
|
|
98
|
100
|
tip.setStatus("success");
|
|
99
|
101
|
tip.setUid(new Date().getTime());
|
|
100
|
102
|
tip.setUrl("http://192.168.3.233" + meeting.getTitlePicture());
|
|
|
@ -113,7 +115,6 @@ public class MeetingController {
|
|
113
|
115
|
String[] subjects = meetingForm.getSubjects();
|
|
114
|
116
|
String[] industries = meetingForm.getIndustries();
|
|
115
|
117
|
String[] attendersType = meetingForm.getAttendersType();
|
|
116
|
|
Date[] startAndEndTime = meetingForm.getStartAndEndTime();
|
|
117
|
118
|
for (String s : subjects) {
|
|
118
|
119
|
int i = subjectService.selectIsName(s);
|
|
119
|
120
|
if(i==0){
|
|
|
@ -139,13 +140,22 @@ public class MeetingController {
|
|
139
|
140
|
meeting.setNameCn(meetingForm.getNameCn());
|
|
140
|
141
|
meeting.setNameEn(meetingForm.getNameEn());
|
|
141
|
142
|
meeting.setAddress(meetingForm.getAddress());
|
|
|
143
|
Date[] startAndEndTime = meetingForm.getStartAndEndTime();
|
|
142
|
144
|
if (startAndEndTime != null && startAndEndTime.length == 2) {
|
|
143
|
145
|
meeting.setStartTime(startAndEndTime[0]);
|
|
144
|
146
|
meeting.setEndTime(startAndEndTime[1]);
|
|
145
|
147
|
}
|
|
146
|
148
|
meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
|
|
147
|
|
String[] titlePictures = meetingForm.getTitlePicture();
|
|
148
|
|
String titlePicture = StringUtils.join(titlePictures, ",");
|
|
|
149
|
|
|
|
150
|
TitlePictureForm[] titlePictures = meetingForm.getTitlePicture();
|
|
|
151
|
String titlePicture = "";
|
|
|
152
|
for (int i = 0; i < titlePictures.length; i++) {
|
|
|
153
|
if (i==0) {
|
|
|
154
|
titlePicture += titlePictures[i].getUrl();
|
|
|
155
|
} else {
|
|
|
156
|
titlePicture += "," + titlePictures[i].getUrl();
|
|
|
157
|
}
|
|
|
158
|
}
|
|
149
|
159
|
meeting.setTitlePicture(titlePicture);
|
|
150
|
160
|
meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
|
|
151
|
161
|
meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
|
|
|
@ -230,8 +240,15 @@ public class MeetingController {
|
|
230
|
240
|
meeting.setEndTime(startAndEndTime[1]);
|
|
231
|
241
|
}
|
|
232
|
242
|
meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
|
|
233
|
|
String[] titlePictures = meetingForm.getTitlePicture();
|
|
234
|
|
String titlePicture = StringUtils.join(titlePictures, ",");
|
|
|
243
|
TitlePictureForm[] titlePictures = meetingForm.getTitlePicture();
|
|
|
244
|
String titlePicture = "";
|
|
|
245
|
for (int i = 0; i < titlePictures.length; i++) {
|
|
|
246
|
if (i==0) {
|
|
|
247
|
titlePicture += titlePictures[i].getUrl();
|
|
|
248
|
} else {
|
|
|
249
|
titlePicture += "," + titlePictures[i].getUrl();
|
|
|
250
|
}
|
|
|
251
|
}
|
|
235
|
252
|
meeting.setTitlePicture(titlePicture);
|
|
236
|
253
|
meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
|
|
237
|
254
|
meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
|
huwhois