Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 部门管理
@@ -46,6 +47,15 @@ public class SysDeptController {
         return new Result<List<SysDeptDTO>>().ok(list);
     }
 
+    @GetMapping("sublist/{pid}")
+    @ApiOperation("子列表")
+    public Result<List<SysDeptDTO>> sublist(@PathVariable("pid") String pid){
+        Map map = new HashMap();
+        map.put("pid",pid);
+        List<SysDeptDTO> list = sysDeptService.subList(map);
+        return new Result<List<SysDeptDTO>>().ok(list);
+    }
+
     @GetMapping("{id}")
     @ApiOperation("信息")
     public Result<SysDeptDTO> get(@PathVariable("id") Long id){

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -39,4 +39,6 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @param id   部门ID
      */
     List<Long> getSubDeptIdList(String id);
+
+    List<SysDeptEntity> getSubList(Map<String, Object> params);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -34,6 +34,9 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
 
     void delete(Long id);
 
+    //根据pid获取下一级子列表
+    List<SysDeptDTO> subList(Map<String, Object> params);
+
     /**
      * 根据部门ID，获取本部门及子部门ID列表
      * @param id   部门ID

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -59,6 +59,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return TreeUtils.build(dtoList);
     }
 
+    @Override
+    public List<SysDeptDTO> subList(Map<String, Object> params) {
+        //查询部门列表
+        List<SysDeptEntity> entityList = baseDao.getSubList(params);
+        List<SysDeptDTO> dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
+        return TreeUtils.build(dtoList);
+    }
+
     @Override
     public SysDeptDTO get(Long id) {
         //超级管理员，部门ID为null

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -15,6 +15,10 @@
         order by t1.sort asc
     </select>
 
+    <select id="getSubList" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
+        SELECT * FROM sys_dept WHERE pid = #{pid} and del_flag = '0'
+    </select>
+
     <select id="getById" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
         select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
           where t1.id = #{value} and t1.del_flag = 0

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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<PageData<PartyMembersDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PartyMembersDTO> page = partyMembersService.page(params);
+
+        return new Result<PageData<PartyMembersDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PartyMembersDTO> get(@PathVariable("id") String id){
+        PartyMembersDTO data = partyMembersService.get(id);
+
+        return new Result<PartyMembersDTO>().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<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PartyMembersDTO> list = partyMembersService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, PartyMembersExcel.class);
+    }
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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<PartyMembersEntity> {
+	
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java

@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+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 BaseEpdcEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	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;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+    }
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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<PartyMembersEntity> {
+
+    PageData<PartyMembersDTO> page(Map<String, Object> params);
+
+    List<PartyMembersDTO> list(Map<String, Object> params);
+
+    PartyMembersDTO get(String id);
+
+    void save(PartyMembersDTO dto);
+
+    void update(PartyMembersDTO dto);
+
+    void delete(String[] ids);
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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<PartyMembersDao, PartyMembersEntity> implements PartyMembersService {
+    @Autowired
+    private PartyMembersRedis partyMembersRedis;
+
+    @Override
+    public PageData<PartyMembersDTO> page(Map<String, Object> params) {
+        IPage<PartyMembersEntity> page = baseDao.selectPage(
+                getPage(params, Constant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+
+        return getPageData(page, PartyMembersDTO.class);
+    }
+
+    @Override
+    public List<PartyMembersDTO> list(Map<String, Object> params) {
+        List<PartyMembersEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PartyMembersDTO.class);
+    }
+
+    private QueryWrapper<PartyMembersEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<PartyMembersEntity> 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));
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.PartyMembersDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.PartyMembersEntity" id="partyMembersMap">
+        <result property="id" column="ID"/>
+        <result property="realName" column="REAL_NAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="identityNo" column="IDENTITY_NO"/>
+        <result property="post" column="POST"/>
+        <result property="postId" column="POST_ID"/>
+        <result property="cadreFlag" column="CADRE_FLAG"/>
+        <result property="registFlag" column="REGIST_FLAG"/>
+        <result property="registTime" column="REGIST_TIME"/>
+        <result property="streetName" column="STREET_NAME"/>
+        <result property="streetId" column="STREET_ID"/>
+        <result property="communityName" column="COMMUNITY_NAME"/>
+        <result property="communityId" column="COMMUNITY_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+
+</mapper>