..

src/main/java/io/renren/RenrenApplication.java

@@ -11,7 +11,6 @@ package io.renren;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class RenrenApplication {

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

@@ -26,8 +26,6 @@ import io.renren.modules.admin.entity.MemberEntity;
import io.renren.modules.admin.service.MemberService;
import io.renren.modules.sys.controller.AbstractController;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.EmployeeService;
import io.renren.modules.admin.entity.EmployeeEntity;
/**
 * 会员表
@@ -40,12 +38,9 @@ import io.renren.modules.admin.entity.EmployeeEntity;
@RequestMapping("/admin/member")
@Api("会员管理")
public class MemberController extends AbstractController  {
    
    @Autowired
    private MemberService memberService;
    @Autowired
    private EmployeeService employeeService;
    @Autowired
    private AttendersService attendersService;
    /**
     * 列表
@@ -55,7 +50,7 @@ public class MemberController extends AbstractController  {
    @ApiOperation("列表")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = memberService.queryPage(params);
                
        return R.ok().put("page", page);
    }
@@ -66,16 +61,11 @@ public class MemberController extends AbstractController  {
    @RequiresPermissions("admin:member:info")
    @ApiOperation("个人信息")
    public R info(@PathVariable("id") Long id){
		MemberEntity member = memberService.getById(id);
        List<Map<String, Object>> meetingList = attendersService.getMeetingListByMemberId(id);
        Long servicerId = member.getServicerId();
        EmployeeEntity employee = new EmployeeEntity();
        if (servicerId != 0) {
            employee = employeeService.getById(servicerId);
        }
        MemberEntity member = memberService.getById(id);
        member.setPassword("");
        List<Map<String, Object>> meetingList = memberService.getMeetingListById(id);
        
        return R.ok().put("member", member).put("meetingList", meetingList).put("employee", employee);
        return R.ok().put("member", member).put("meetingList", meetingList);
    }
    /**
@@ -121,7 +111,7 @@ public class MemberController extends AbstractController  {
    }
    @PostMapping("/status")
    @RequiresPermissions("admin:member:status")
    @RequiresPermissions("admin:member:update")
    @ApiOperation("改变审核状态")
    public R status(@RequestBody Map<String, Object> params){   
        Long id = Long.valueOf(params.get("id").toString());

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

@@ -38,4 +38,10 @@ public interface MemberDao extends BaseMapper<MemberEntity> {
     */
    @Select("select id,truename,organization,position,job_title as jiobTitle,phone,email from member where is_del=0;")
    List<Map<String, Object>> selectList();
    /**
     * 根据会员id, 查询获取最近参加的会议
     */
    @Select("SELECT a.id as aid,a.meeting_id,m.name_cn FROM attenders a JOIN meeting m ON a.meeting_id=m.id WHERE a.member_id=#{Id} ORDER BY a.id;")
    List<Map<String, Object>> getMeetingListById(Long Id);
}

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

@@ -3,7 +3,6 @@ package io.renren.modules.admin.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -85,18 +84,14 @@ public class MemberEntity implements Serializable {
	 * 办公电话
	 */
	private String officephone;
	/**
	 * 其他联系方式
	 */
	private String otherphone;
	/**
	 * 负责人id
	 */
	private Long servicerId;
	/**
	 * 备注
	 */
	private String note;
	/**
	 * 是否通过审核 0:未通过 1:通过
	 */
	private Integer isCheck;
	/**
	 * 创建时间
	 */
@@ -105,14 +100,6 @@ public class MemberEntity implements Serializable {
	 * 修改时间
	 */
	private Date modifyTime;
	/**
	 * 是否通过审核 0:未通过 1:通过
	 */
	private Integer isCheck;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	private Integer isDel;
	/**
	 * 修改人
	 */
@@ -121,4 +108,8 @@ public class MemberEntity implements Serializable {
	 * 修改人
	 */
	private Long createId;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	private Integer isDel;
}

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

@@ -19,7 +19,13 @@ import io.renren.modules.admin.entity.MemberEntity;
 */
public interface MemberService extends IService<MemberEntity> {
    PageUtils queryPage(Map<String, Object> params);
	PageUtils queryPage(Map<String, Object> params);
	
   /**
     * 根据会员id, 查询获取最近参加的会议
	 * @param id
     */
	List<Map<String, Object>> getMeetingListById(Long id);
    /**
	 * 保存用户

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

@@ -22,15 +22,11 @@ import io.renren.common.utils.Query;
import io.renren.modules.admin.dao.MemberDao;
import io.renren.modules.admin.entity.MemberEntity;
import io.renren.modules.admin.service.MemberService;
import io.renren.modules.admin.entity.EmployeeEntity;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.EmployeeService;
@Service("memberService")
public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> implements MemberService {
    @Autowired
    private EmployeeService employeeService;
    @Autowired
    private AttendersService attendersService;
@@ -61,19 +57,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
            mMap.put("email", member.getEmail());
            mMap.put("createTime", member.getCreateTime());
            mMap.put("isCheck", member.getIsCheck());
            Long servicerId = member.getServicerId();
            if (servicerId != 0) {
                Map<String, Object> employeeMap = employeeService.getMap(
                    new QueryWrapper<EmployeeEntity>().eq("id", servicerId));
                    System.out.println(employeeMap);
                    if (employeeMap != null && employeeMap.containsKey("truename")) {
                        mMap.put("servicerName", employeeMap.get("truename"));
                    } else {
                        mMap.put("servicerName", "");
                    }
            } else {
                mMap.put("servicerName", "");
            }
            List<Map<String, Object>> meetingList = attendersService.getMeetingListByMemberId(memberId);
            int meetingCounts = meetingList.size();
            if (meetingCounts > 0) {
@@ -118,7 +101,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
    public int updateStatus(Long id, Integer isCheck) {
        int itemp = baseMapper.updateStatus(id, isCheck);
        return itemp;
        // @Update("update member set is_check=#{is_check}  where id = #{id}")
    }
    @Override
@@ -145,4 +127,9 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
    public List<Map<String, Object>> getList() {
        return baseMapper.selectList();
    }
    @Override
    public List<Map<String, Object>> getMeetingListById(Long id) {
        return baseMapper.getMeetingListById(id);
    }
}