..

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

@@ -6,9 +6,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.GetMapping;
@@ -40,25 +37,6 @@ public class EmployeeController {
    @Autowired
    private EmployeeService employeeService;
//    /**
//     * 列表
//     */
//    @RequestMapping("/list")
//    @RequiresPermissions("generator:employee:list")
//    public  Map<String,Object> SelectMyPage (Page page,@RequestBody EmployeeEntity employeeEntity){
//        Map<String,Object> map = new HashMap<>();
//        QueryWrapper<EmployeeEntity> queryWrapper = new QueryWrapper<>();
//        if(StrUtil.isNotBlank(employeeEntity.getUsername())){
//            queryWrapper.like("e.username",employeeEntity.getUsername());
//        }
//        if(StrUtil.isNotBlank(employeeEntity.getTruename())){
//            queryWrapper.like("e.truename",employeeEntity.getTruename());
//        }
//
//        IPage<EmployeeEntity> selectMyPage = employeeService.selectMyPage(page, queryWrapper);
//        map.put("page",selectMyPage);
//        return map ;
//    }
    /**
     * 列表
     */
@@ -70,7 +48,6 @@ public class EmployeeController {
        return R.ok().put("page", page);
    }
    /**
     * 列表
     */
@@ -84,9 +61,6 @@ public class EmployeeController {
        return R.ok().put("page",page);
    }
    /**
     * findAll
     */
@@ -235,4 +209,22 @@ public class EmployeeController {
        List<Map<String, Object>> list = employeeService.selectNameList(truename);
        return  R.ok().put("list", list);
    }
    /**
     * 模糊查询company_id获取 employee id,name(获得id在分配人员时使用)
     */
    
    @GetMapping("/listbycid/{cid}")
    @RequiresPermissions("admin:employee:list")
    public R selectNameListByCompanyId(@PathVariable("cid") Long cid) {
        List<Map<String, Object>> 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);
        return  R.ok().put("list", list);
    }
}

src/main/java/io/renren/modules/admin/dao/EmployeeDao.java

@@ -48,4 +48,13 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
     */
    @Select("select id,truename from employee where truename like '%${truename}%'")
    List<Map<String, Object>> selectNameList(String truename);
    @Select("SELECT `id`,`truename` FROM `employee` WHERE `company_id`=#{companyId};")
    List<Map<String, Object>> selectNameListByCompanyId(Long companyId);
    /**
     * 获取联系工作人员联系方式
     */
    @Select("SELECT `id`,`truename`,`phone` FROM `employee` WHERE `id` IN(${ids});")
    List<Map<String, Object>> getContact(String ids);
}

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

@@ -76,7 +76,7 @@ public class MeetingEntity implements Serializable {
	/**
	 * 会议负责人ids
	 */
	private Long serviceIds;
	private String serviceIds;
	/**
	 * 线上报名截止时间
	 */

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

@@ -9,7 +9,6 @@ import io.renren.modules.admin.entity.EmployeeEntity;
import javafx.scene.control.Pagination;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -28,6 +27,7 @@ public interface EmployeeService extends IService<EmployeeEntity> {
    /**
     * 根据真实姓名模糊查询
     * 
     * @param truename
     * @return
     */
@@ -37,15 +37,24 @@ public interface EmployeeService extends IService<EmployeeEntity> {
    void delete(Long[] ids);
    // 多表联查 + 分页
    PageUtils queryList(int page, int limit, String key);
    //多表联查 + 分页
   PageUtils queryList(int page,int limit,String key);
    
   /**
    /**
     * 根据真实姓名模糊查询id
     * 
     * @param truename
     * @return
     */
   List<Map<String, Object>> selectNameList(String truename);
}
    List<Map<String, Object>> selectNameList(String truename);
    /**
     * 根据单位获取员工列表
     * 
     * @param companyId
     * @return
     */
    List<Map<String, Object>> selectNameListByCompanyId(Long companyId);
    List<Map<String, Object>> getContact(String ids);
}

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

@@ -81,4 +81,14 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
    public List<Map<String, Object>> selectNameList(String truename) {
        return baseMapper.selectNameList(truename);
    }
    @Override
    public List<Map<String, Object>> selectNameListByCompanyId(Long companyId) {
        return baseMapper.selectNameListByCompanyId(companyId);
    }
    @Override
    public List<Map<String, Object>> getContact(String ids) {
        return baseMapper.getContact(ids);
    }
}

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

@@ -3,11 +3,16 @@ package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import io.renren.modules.admin.service.EmployeeService;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.MoneyAccountService;
import io.renren.modules.admin.entity.PaperRequireEntity;
import io.renren.modules.admin.service.PaperRequireService;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -29,6 +34,8 @@ public class AppMeetingController {
    private MoneyAccountService moneyAccountService;
    @Autowired
    private PaperRequireService paperRequireService;
    @Autowired
    private EmployeeService employeeService;
    /**
     * 获取会议信息
@@ -40,8 +47,43 @@ public class AppMeetingController {
        return R.ok().put("meeting", meeting);
    }
    /**
     * 获取会议联系方式
     */
    @GetMapping("/contact/{id}")
    public R contact(@PathVariable("id") Long id) {
        MeetingEntity meeting = meetingService.getById(id);
        String serviceIds = meeting.getServiceIds();
        List<Map<String, Object>> list = employeeService.getContact(serviceIds);
        return R.ok().put("list", list);
    }
    /**
     * 会议提示
     */
    @GetMapping("/tips/{id}")
    public R tips(@PathVariable("id") Long id) {
        MeetingEntity meeting = meetingService.getById(id);
        // 线上报名截止时间
        Date onlineRegDeadline = meeting.getOnlineRegDeadline();
       
        // 现场报名截止时间
        Date onsiteRegDeadline = meeting.getOnsiteRegDeadline();
        
        PaperRequireEntity paperRequir = paperRequireService.getOneByMeetingId(id);
        // 征文截止时间
        Date paperDealine = paperRequir.getDeadline();
        return R.ok().put("onlineRegDeadline", onlineRegDeadline)
            .put("onsiteRegDeadline", onsiteRegDeadline).put("paperDealine", paperDealine);
    }
    /**
     * 根据meetingId信息获取对公账号
     * @param mid
     * @return
     */
    @GetMapping("/accountinfo/{mid}")
    public R infoByMid(@PathVariable("mid") Long mid){