..

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

@@ -217,14 +217,14 @@ public class EmployeeController {
    @GetMapping("/listbycid/{cid}")
    @RequiresPermissions("admin:employee:list")
    public R selectNameListByCompanyId(@PathVariable("cid") Long cid) {
        List<Map<String, Object>> list = employeeService.selectNameListByCompanyId(cid);
        Map<Long, String> list = employeeService.selectNameListByCompanyId(cid);
        return  R.ok().put("list", list);
    }
    // 默认单位id1
    @GetMapping("/listbycid")
    @RequiresPermissions("admin:employee:list")
    public R selectNameListByCompanyId() {
        List<Map<String, Object>> list = employeeService.selectNameListByCompanyId(1L);
        Map<Long, String> list = employeeService.selectNameListByCompanyId(1L);
        return  R.ok().put("list", list);
    }
}

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

@@ -6,10 +6,13 @@ import io.renren.modules.admin.entity.IndustryEntity;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.SubjectEntity;
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
import io.renren.modules.admin.form.MeetingForm;
import io.renren.modules.admin.service.IndustryService;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.SubjectService;
import io.renren.modules.admin.service.TypesOfAttendersService;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
@@ -86,87 +89,61 @@ public class MeetingController {
    /**
     * 保存
     */
    @RequestMapping("/save")
    @PostMapping("save")
    @RequiresPermissions("admin:meeting:save")
    public R save(@RequestBody MeetingEntity meeting){
        String subjects = meeting.getSubjects();
        String industries = meeting.getIndustries();
        String attendersType = meeting.getAttendersType();
        boolean sub = subjects.contains(",");
        if (sub){
            String[] subject = subjects.split(",");
            for (String s : subject) {
                int i = subjectService.selectIsName(s);
                if(i==0){
                    SubjectEntity se = new SubjectEntity();
                    se.setName(s);
                    se.setCreateTime(new Date());
                    subjectService.save(se);
                }
            }
        }else{
            int i = subjectService.selectIsName(subjects);
    public R save(@RequestBody MeetingForm meetingForm){
        String[] subjects = meetingForm.getSubjects();
        String[] industries = meetingForm.getIndustries();
        String[] attendersType = meetingForm.getAttendersType();
        for (String s : subjects) {
            int i = subjectService.selectIsName(s);
            if(i==0){
                SubjectEntity se = new SubjectEntity();
                se.setName(subjects);
                se.setName(s);
                se.setCreateTime(new Date());
                subjectService.save(se);
            }
        }
        boolean ind = industries.contains(",");
        if(ind){
            String[] industry = industries.split(",");
            for (String s : industry) {
                int i = industryService.selectIsName(s);
                if(i==0){
                    IndustryEntity in = new IndustryEntity();
                    in.setName(s);
                    in.setCreateTime(new Date());
                    industryService.save(in);
                }
            }
        }else{
            int i = industryService.selectIsName(industries);
        for (String s : industries) {
            int i = industryService.selectIsName(s);
            if(i==0){
                IndustryEntity in = new IndustryEntity();
                in.setName(industries);
                in.setName(s);
                in.setCreateTime(new Date());
                industryService.save(in);
            }
        }
        meeting.setCreateTime(new Date());
        MeetingEntity meeting= new MeetingEntity();
        meeting.setCompanyId((long) 1);
        meeting.setNameCn(meetingForm.getNameCn());
        meeting.setNameEn(meetingForm.getNameEn());
        meeting.setAddress(meetingForm.getAddress());
        meeting.setStartTime(meetingForm.getStartTime());
        meeting.setEndTime(meetingForm.getEndTime());
        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());
        meeting.setContactIds(StringUtils.join(meetingForm.getContactIds(), ","));
        meeting.setContactNames(StringUtils.join(meetingForm.getContactNames(), ","));
        meeting.setOnlineRegDeadline(meetingForm.getOnlineRegDeadline());
        meeting.setOnsiteRegDeadline(meetingForm.getOnsiteRegDeadline());
        meeting.setIntroduction(meetingForm.getIntroduction());
        meeting.setCreateTime(new Date());
        meetingService.save(meeting);
        Long meetingid = meeting.getId();
        boolean att = attendersType.contains(",");
        if(att){
            String[] attenderType = attendersType.split(",");
            for (String s : attenderType) {
                int i = typesOfAttendersService.selectIsnameAndId(s, meetingid);
                if(i==0) {
                    TypesOfAttendersEntity typesOfAttenders = new TypesOfAttendersEntity();
                    typesOfAttenders.setMeetingId(meetingid);
                    typesOfAttenders.setName(s);
                    typesOfAttenders.setCreateTime(new Date());
                    typesOfAttendersService.save(typesOfAttenders);
                }
            }
        }else{
            int i = typesOfAttendersService.selectIsnameAndId(attendersType, meetingid);
        for (String s : attendersType) {
            int i = typesOfAttendersService.selectIsnameAndId(s, meetingid);
            if(i==0) {
                TypesOfAttendersEntity typesOfAttenders = new TypesOfAttendersEntity();
                typesOfAttenders.setMeetingId(meetingid);
                typesOfAttenders.setName(attendersType);
                typesOfAttenders.setName(s);
                typesOfAttenders.setCreateTime(new Date());
                typesOfAttendersService.save(typesOfAttenders);
            }
@@ -180,84 +157,63 @@ public class MeetingController {
     */
    @RequestMapping("/update")
    @RequiresPermissions("admin:meeting:update")
    public R update(@RequestBody MeetingEntity meeting){
        String subjects = meeting.getSubjects();
        String industries = meeting.getIndustries();
        String attendersType = meeting.getAttendersType();
        Long meetingid = meeting.getId();
        System.out.println("会议id"+meetingid);
        boolean sub = subjects.contains(",");
        if(sub){
            String[] subject = subjects.split(",");
            for (String s : subject) {
                int i = subjectService.selectIsName(s);
                if(i==0){
                    SubjectEntity se = new SubjectEntity();
                    se.setName(s);
                    se.setCreateTime(new Date());
                    subjectService.save(se);
                }
            }
        }else{
            int i = subjectService.selectIsName(subjects);
    public R update(@RequestBody MeetingForm meetingForm){
        String[] subjects = meetingForm.getSubjects();
        String[] industries = meetingForm.getIndustries();
        String[] attendersType = meetingForm.getAttendersType();
        Long meetingid = meetingForm.getId();
        for (String s : subjects) {
            int i = subjectService.selectIsName(s);
            if(i==0){
                SubjectEntity se = new SubjectEntity();
                se.setName(subjects);
                se.setName(s);
                se.setCreateTime(new Date());
                subjectService.save(se);
            }
        }
        boolean ind = industries.contains(",");
        if(ind){
            String[] industry = industries.split(",");
            for (String s : industry) {
                int i = industryService.selectIsName(s);
                if(i==0){
                    IndustryEntity in = new IndustryEntity();
                    in.setName(s);
                    in.setCreateTime(new Date());
                    industryService.save(in);
                }
            }
        }else{
            int i = industryService.selectIsName(industries);
        for (String s : industries) {
            int i = industryService.selectIsName(s);
            if(i==0){
                IndustryEntity in = new IndustryEntity();
                in.setName(industries);
                in.setName(s);
                in.setCreateTime(new Date());
                industryService.save(in);
            }
        }
        boolean att = attendersType.contains(",");
        if(att){
            String[] attenderType = attendersType.split(",");
            for (String s : attenderType) {
                int i = typesOfAttendersService.selectIsnameAndId(s, meetingid);
                if(i==0) {
                    TypesOfAttendersEntity typesOfAttenders = new TypesOfAttendersEntity();
                    typesOfAttenders.setMeetingId(meetingid);
                    typesOfAttenders.setName(s);
                    typesOfAttenders.setCreateTime(new Date());
                    typesOfAttendersService.save(typesOfAttenders);
                }
            }
        }else{
            int i = typesOfAttendersService.selectIsnameAndId(attendersType, meetingid);
        for (String s : attendersType) {
            int i = typesOfAttendersService.selectIsnameAndId(s, meetingid);
            if(i==0) {
                TypesOfAttendersEntity typesOfAttenders = new TypesOfAttendersEntity();
                typesOfAttenders.setMeetingId(meetingid);
                typesOfAttenders.setName(attendersType);
                typesOfAttenders.setName(s);
                typesOfAttenders.setCreateTime(new Date());
                typesOfAttendersService.save(typesOfAttenders);
            }
        }
        MeetingEntity meeting= new MeetingEntity();
        meeting.setId(meetingid);
        meeting.setCompanyId((long) 1);
        meeting.setNameCn(meetingForm.getNameCn());
        meeting.setNameEn(meetingForm.getNameEn());
        meeting.setAddress(meetingForm.getAddress());
        meeting.setStartTime(meetingForm.getStartTime());
        meeting.setEndTime(meetingForm.getEndTime());
        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());
        meeting.setContactIds(StringUtils.join(meetingForm.getContactIds(), ","));
        meeting.setContactNames(StringUtils.join(meetingForm.getContactNames(), ","));
        meeting.setOnlineRegDeadline(meetingForm.getOnlineRegDeadline());
        meeting.setOnsiteRegDeadline(meetingForm.getOnsiteRegDeadline());
        meeting.setIntroduction(meetingForm.getIntroduction());
        meeting.setModifyTime(new Date());
		meetingService.updateById(meeting);

src/main/java/io/renren/modules/admin/entity/MeetingEntity.java

@@ -76,7 +76,7 @@ public class MeetingEntity implements Serializable {
	/**
	 * 会议负责人id
	 */
	private String serviceId;
	private Long serviceId;
	/**
	 * 会议联系人id
	 */
@@ -114,5 +114,4 @@ public class MeetingEntity implements Serializable {
	 */
	@TableLogic
	private Integer isDel;
}

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

@@ -0,0 +1,93 @@
package io.renren.modules.admin.form;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import lombok.Data;
/**
 * 会议表单
 */
@Data
public class MeetingForm {
    /**
	 * 会议id (会议表)
	 */
	private Long id;
	/**
	 * 举办单位id
	 */
	private Long companyId;
	/**
	 * 会议名称(中文)
	 */
	private String nameCn;
	/**
	 * 会议名称(英文)
	 */
	private String nameEn;
	/**
	 * 举办地点
	 */
	private String address;
	/**
	 * 开始时间
	 */
	private Date startTime;
	/**
	 * 结束时间
	 */
	private Date endTime;
	/**
	 * 官方网址
	 */
	private String officeWebsite;
	/**
	 * 会议封面图片地址
	 */
	private String titlePicture;
	/**
	 * 涉及学科
	 */
	private String[] subjects;
	/**
	 * 涉及行业
	 */
	private String[] industries;
	/**
	 * 参会人员类型
	 */
	private String[] attendersType;
	/**
	 * 会议负责人
	 */
	private String serviceName;
	/**
	 * 会议负责人id
	 */
	private Long serviceId;
	/**
	 * 会议联系人id
	 */
	private Long[] contactIds;
	/**
	 * 会议联系人
	 */
	private String[] contactNames;
	/**
	 * 线上报名截止时间
	 */
	private Date onlineRegDeadline;
	/**
	 * 现场报名截止时间
	 */
	private Date onsiteRegDeadline;
	/**
	 * 会议介绍
	 */
	private String introduction;
	/**
	 * 是否通过审核 0:未通过 1:通过
	 */
	private Integer isCheck;
}

src/main/java/io/renren/modules/admin/service/EmployeeService.java

@@ -54,7 +54,7 @@ public interface EmployeeService extends IService<EmployeeEntity> {
     * @param companyId
     * @return
     */
    List<Map<String, Object>> selectNameListByCompanyId(Long companyId);
    Map<Long, String> selectNameListByCompanyId(Long companyId);
    List<Map<String, Object>> getContact(String ids);
}

src/main/java/io/renren/modules/admin/service/impl/EmployeeServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -83,8 +84,16 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
    }
    @Override
    public List<Map<String, Object>> selectNameListByCompanyId(Long companyId) {
        return baseMapper.selectNameListByCompanyId(companyId);
    public Map<Long, String> selectNameListByCompanyId(Long companyId) {
        List<Map<String, Object>> list= baseMapper.selectNameListByCompanyId(companyId);
        Map<Long, String> result = new HashMap<Long, String>();
        for (Map<String,Object> map : list) {
            Long id =(Long) map.get("id");
            String name = (String) map.get("truename");
            result.put(id, name);
        }
        return result;
    }
    @Override