..

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

@@ -41,17 +41,13 @@ import java.util.Map;
public class MeetingController {
    @Autowired
    private MeetingService meetingService;
    @Autowired
    private SubjectService subjectService;
    @Autowired
    private IndustryService industryService;
    @Autowired
    private TypesOfAttendersService typesOfAttendersService;
@Autowired
    @Autowired
    private EmployeeService employeeService;
    /**
     * 列表
@@ -95,6 +91,7 @@ public class MeetingController {
        String[] subjects = meetingForm.getSubjects();
        String[] industries = meetingForm.getIndustries();
        String[] attendersType = meetingForm.getAttendersType();
        Date[] startAndEndTime = meetingForm.getStartAndEndTime();
        for (String s : subjects) {
            int i = subjectService.selectIsName(s);
            if(i==0){
@@ -120,15 +117,16 @@ public class MeetingController {
        meeting.setNameCn(meetingForm.getNameCn());
        meeting.setNameEn(meetingForm.getNameEn());
        meeting.setAddress(meetingForm.getAddress());
        meeting.setStartTime(meetingForm.getStartTime());
        meeting.setEndTime(meetingForm.getEndTime());
        meeting.setStartTime(startAndEndTime[0]);
        meeting.setEndTime(startAndEndTime[1]);
        meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
        meeting.setTitlePicture(meetingForm.getTitlePicture());
        meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
        meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
        meeting.setAttendersType(StringUtils.join(meetingForm.getAttendersType(), ","));
        meeting.setServiceId(meetingForm.getServiceId());
        meeting.setServiceName(meetingForm.getServiceName());
        EmployeeEntity employee = employeeService.getById(meetingForm.getServiceId());
        meeting.setServiceName(employee.getTruename());
        meeting.setContactIds(StringUtils.join(meetingForm.getContactIds(), ","));
        meeting.setContactNames(StringUtils.join(meetingForm.getContactNames(), ","));
        meeting.setOnlineRegDeadline(meetingForm.getOnlineRegDeadline());
@@ -161,6 +159,7 @@ public class MeetingController {
        String[] subjects = meetingForm.getSubjects();
        String[] industries = meetingForm.getIndustries();
        String[] attendersType = meetingForm.getAttendersType();
        Date[] startAndEndTime = meetingForm.getStartAndEndTime();
        Long meetingid = meetingForm.getId();
        for (String s : subjects) {
@@ -200,15 +199,16 @@ public class MeetingController {
        meeting.setNameCn(meetingForm.getNameCn());
        meeting.setNameEn(meetingForm.getNameEn());
        meeting.setAddress(meetingForm.getAddress());
        meeting.setStartTime(meetingForm.getStartTime());
        meeting.setEndTime(meetingForm.getEndTime());
        meeting.setStartTime(startAndEndTime[0]);
        meeting.setEndTime(startAndEndTime[1]);
        meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
        meeting.setTitlePicture(meetingForm.getTitlePicture());
        meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
        meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
        meeting.setAttendersType(StringUtils.join(meetingForm.getAttendersType(), ","));
        meeting.setServiceId(meetingForm.getServiceId());
        meeting.setServiceName(meetingForm.getServiceName());
        EmployeeEntity employee = employeeService.getById(meetingForm.getServiceId());
        meeting.setServiceName(employee.getTruename());
        meeting.setContactIds(StringUtils.join(meetingForm.getContactIds(), ","));
        meeting.setContactNames(StringUtils.join(meetingForm.getContactNames(), ","));
        meeting.setOnlineRegDeadline(meetingForm.getOnlineRegDeadline());

src/main/java/io/renren/modules/admin/form/MeetingForm.java

@@ -30,14 +30,18 @@ public class MeetingForm {
	 * 举办地点
	 */
	private String address;
	/**
	 * 开始时间
	 */
	private Date startTime;
	/**
	 * 结束时间
	 */
	private Date endTime;
	// /**
	//  * 开始时间
	//  */
	// private Date startTime;
	// /**
	//  * 结束时间
	//  */
	// private Date endTime;
	/**
	 * 开始-结束时间
	 */
	private Date[] startAndEndTime;
	/**
	 * 官方网址
	 */

src/main/java/io/renren/modules/app/controller/AppOrderController.java

@@ -1,13 +1,11 @@
package io.renren.modules.app.controller;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;