diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
new file mode 100755
index 000000000..01b6b591d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Data
+public class PartyMembersDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String id;
+
+ private String realName;
+
+ private String mobile;
+
+ private String identityNo;
+
+ private String post;
+
+ private String postId;
+
+ private String cadreFlag;
+
+ private String registFlag;
+
+ private Date registTime;
+
+ private String streetName;
+
+ private String streetId;
+
+ private String communityName;
+
+ private String communityId;
+
+ private String gridName;
+
+ private String gridId;
+
+ private String deptId;
+
+ private Integer revision;
+
+ private String createdBy;
+
+ private Date createdTime;
+
+ private String updatedBy;
+
+ private Date updatedTime;
+
+ private String delFlag;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
new file mode 100755
index 000000000..d0703110e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.excel.PartyMembersExcel;
+import com.elink.esua.epdc.service.PartyMembersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@RestController
+@RequestMapping("/partymembers")
+public class PartyMembersController {
+ @Autowired
+ private PartyMembersService partyMembersService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = partyMembersService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ PartyMembersDTO data = partyMembersService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyMembersDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ partyMembersService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyMembersDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ partyMembersService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ partyMembersService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyMembersService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, PartyMembersExcel.class);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
new file mode 100755
index 000000000..3ba707d83
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.PartyMembersEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Mapper
+public interface PartyMembersDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
new file mode 100755
index 000000000..e82b4e679
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_party_members")
+public class PartyMembersEntity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 姓名
+ */
+ private String realName;
+ /**
+ * 手机号
+ */
+ private String mobile;
+ /**
+ * 身份证号
+ */
+ private String identityNo;
+ /**
+ * 职务
+ */
+ private String post;
+ /**
+ * 职务ID(字典表)
+ */
+ private String postId;
+ /**
+ * 干部下沉标识(0-否,1-是)
+ */
+ private String cadreFlag;
+ /**
+ * 注册状态(0-否,1-是)
+ */
+ private String registFlag;
+ /**
+ * 注册时间
+ */
+ private Date registTime;
+ /**
+ * 街道名称
+ */
+ private String streetName;
+ /**
+ * 街道ID
+ */
+ private String streetId;
+ /**
+ * 社区名称
+ */
+ private String communityName;
+ /**
+ * 社区ID
+ */
+ private String communityId;
+ /**
+ * 网格名称
+ */
+ private String gridName;
+ /**
+ * 网格ID
+ */
+ private String gridId;
+ /**
+ * 部门ID
+ */
+ private String deptId;
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+ /**
+ * 创建人
+ */
+ private String createdBy;
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
new file mode 100755
index 000000000..8b64f43ed
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Data
+public class PartyMembersExcel {
+ @Excel(name = "主键")
+ private String id;
+ @Excel(name = "姓名")
+ private String realName;
+ @Excel(name = "手机号")
+ private String mobile;
+ @Excel(name = "身份证号")
+ private String identityNo;
+ @Excel(name = "职务")
+ private String post;
+ @Excel(name = "职务ID(字典表)")
+ private String postId;
+ @Excel(name = "干部下沉标识(0-否,1-是)")
+ private String cadreFlag;
+ @Excel(name = "注册状态(0-否,1-是)")
+ private String registFlag;
+ @Excel(name = "注册时间")
+ private Date registTime;
+ @Excel(name = "街道名称")
+ private String streetName;
+ @Excel(name = "街道ID")
+ private String streetId;
+ @Excel(name = "社区名称")
+ private String communityName;
+ @Excel(name = "社区ID")
+ private String communityId;
+ @Excel(name = "网格名称")
+ private String gridName;
+ @Excel(name = "网格ID")
+ private String gridId;
+ @Excel(name = "部门ID")
+ private String deptId;
+ @Excel(name = "乐观锁")
+ private Integer revision;
+ @Excel(name = "创建人")
+ private String createdBy;
+ @Excel(name = "创建时间")
+ private Date createdTime;
+ @Excel(name = "更新人")
+ private String updatedBy;
+ @Excel(name = "更新时间")
+ private Date updatedTime;
+ @Excel(name = "删除标记")
+ private String delFlag;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyMembersRedis.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyMembersRedis.java
new file mode 100755
index 000000000..6d3146c7a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/PartyMembersRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Component
+public class PartyMembersRedis {
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void delete(Object[] ids) {
+
+ }
+
+ public void set(){
+
+ }
+
+ public String get(String id){
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
new file mode 100755
index 000000000..1a4967e1e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.entity.PartyMembersEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+public interface PartyMembersService extends BaseService {
+
+ PageData page(Map params);
+
+ List list(Map params);
+
+ PartyMembersDTO get(String id);
+
+ void save(PartyMembersDTO dto);
+
+ void update(PartyMembersDTO dto);
+
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
new file mode 100755
index 000000000..c1252205d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.dao.PartyMembersDao;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.entity.PartyMembersEntity;
+import com.elink.esua.epdc.redis.PartyMembersRedis;
+import com.elink.esua.epdc.service.PartyMembersService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@Service
+public class PartyMembersServiceImpl extends BaseServiceImpl implements PartyMembersService {
+ @Autowired
+ private PartyMembersRedis partyMembersRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, Constant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+
+ return getPageData(page, PartyMembersDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, PartyMembersDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get("id");
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+ //wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
+
+ return wrapper;
+ }
+
+ @Override
+ public PartyMembersDTO get(String id) {
+ PartyMembersEntity entity = baseDao.selectById(id);
+
+ return ConvertUtils.sourceToTarget(entity, PartyMembersDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(PartyMembersDTO dto) {
+ PartyMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyMembersEntity.class);
+
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(PartyMembersDTO dto) {
+ PartyMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyMembersEntity.class);
+
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ //逻辑删除
+ //logicDelete(ids, PartyMembersEntity.class);
+
+ //物理删除
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
new file mode 100755
index 000000000..de6d7bcee
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file