Merge branches 'dev_pingyin_7_22' and 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java

@@ -74,6 +74,7 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         return baseDao.listPage(params);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java

@@ -82,6 +82,7 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         return baseDao.listPage(params);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactNeighborhoodUserHouseDailyServiceImpl.java

@@ -93,6 +93,7 @@ public class FactNeighborhoodUserHouseDailyServiceImpl extends BaseServiceImpl<F
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         return baseDao.listPage(params);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

@@ -103,6 +103,15 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
     @Override
     public List<FactUserHouseResultDTO> list(Map<String, Object> params) {
         List<FactUserHouseResultDTO> list = new ArrayList<>();
+        if (params.containsKey("startTime") && params.containsKey("endTime")) {
+            if (StringUtils.isNotBlank(params.get("startTime").toString()) && StringUtils.isNotBlank(params.get("endTime").toString())) {
+                params.put("dateId", StringUtils.EMPTY);
+            } else {
+                params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
+            }
+        } else {
+            params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
+        }
         if (params.containsKey("level")) {
             if("neighborhood".equals(params.get("level").toString()) || OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())){
                 list = factNeighborhoodUserHouseDailyService.listExport(params);

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridStaffListFormDTO.java

@@ -0,0 +1,16 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class CustomerGridStaffListFormDTO implements Serializable {
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridStaffListResultDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @DESC
+ */
+@Data
+public class CustomerGridStaffListResultDTO implements Serializable {
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 网格编码
+     */
+    private String gridCode;
+
+    /**
+     * 网格名
+     */
+    private String gridName;
+
+    /**
+     * 区县系统中的网格员唯一编码
+     */
+    private String gridUserId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -695,4 +695,8 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/coverage/dictinit/{customerId}")
     Result dictInit(@PathVariable(value = "customerId") String customerId);
+
+    @PostMapping("/gov/org/customerstaffgrid/gridstaff")
+    Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto);
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -445,4 +445,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId);
     }
 
+    @Override
+    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaff", dto);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java

@@ -29,10 +29,10 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.CustomerGridStaffListFormDTO;
+import com.epmet.dto.form.GridStaffUploadtFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.EventTitleOrgResultDTO;
-import com.epmet.dto.result.GridStaffResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.excel.CustomerStaffGridExcel;
 import com.epmet.service.CustomerStaffGridService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,4 +156,13 @@ public class CustomerStaffGridController {
     public Result<List<String>> getAllStaffByGridId(@RequestParam("gridId")String gridId){
         return new Result<List<String>>().ok(customerStaffGridService.getAllStaffByGridId(gridId));
     }
+
+    /**
+     * @Author sun
+     * @Description  网格下工作人员列表
+     **/
+    @PostMapping(value = "gridstaff")
+    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(@RequestBody CustomerGridStaffListFormDTO formDTO) {
+        return new Result<List<CustomerGridStaffListResultDTO>>().ok(customerStaffGridService.gridStaff(formDTO));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java

@@ -22,6 +22,7 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffOrgRelationDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridStaffListResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -130,4 +131,5 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      */
     List<String> getAllStaffByGridId(String gridId);
 
+    List<CustomerGridStaffListResultDTO> getGridStaffByCustomerId(@Param("customerId") String customerId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java

@@ -22,8 +22,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.CustomerGridStaffListFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.CustomerGridStaffListResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -142,4 +144,5 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      */
     List<String> getAllStaffByGridId(String gridId);
 
+    List<CustomerGridStaffListResultDTO> gridStaff(CustomerGridStaffListFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -29,8 +29,10 @@ import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.CustomerGridStaffListFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.CustomerGridStaffListResultDTO;
 import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -202,4 +204,10 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
     public List<String> getAllStaffByGridId(String gridId) {
         return baseDao.getAllStaffByGridId(gridId);
     }
+
+    @Override
+    public List<CustomerGridStaffListResultDTO> gridStaff(CustomerGridStaffListFormDTO formDTO) {
+        return baseDao.getGridStaffByCustomerId(formDTO.getCustomerId());
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -196,4 +196,20 @@
         WHERE DEL_FLAG = '0'
           AND GRID_ID = #{gridId}
     </select>
+
+    <select id="getGridStaffByCustomerId" resultType="com.epmet.dto.result.CustomerGridStaffListResultDTO">
+        SELECT
+            b.id gridId,
+            b.grid_name gridName,
+            b. code gridCode,
+            a.user_id gridUserId
+        FROM
+            customer_staff_grid a
+        INNER JOIN customer_grid b ON a.grid_id = b.id AND b.del_flag = '0'
+        WHERE
+            a.del_flag = '0'
+        AND a.customer_id = #{customerId}
+        ORDER BY a.grid_id ASC
+    </select>
+
 </mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/EventreportPingyinController.java

@@ -0,0 +1,31 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+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 generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@RestController
+@RequestMapping("eventreportPingyin")
+public class EventreportPingyinController {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/GridInfoPingyinController.java

@@ -0,0 +1,31 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+
+/**
+ * 平阴区网格表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@RestController
+@RequestMapping("gridInfoPingyin")
+public class GridInfoPingyinController {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/GridstaffInfoPingyinController.java

@@ -0,0 +1,30 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+
+/**
+ * 平阴区网格员基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@RestController
+@RequestMapping("gridstaffInfoPingyin")
+public class GridstaffInfoPingyinController {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/GridstaffWorkInfoPingyinController.java

@@ -0,0 +1,32 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+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 generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@RestController
+@RequestMapping("gridstaffWorkInfoPingyin")
+public class GridstaffWorkInfoPingyinController {
+
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/EventreportPingyinDao.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.EventreportPingyinEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 平阴区事件上报中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Mapper
+public interface EventreportPingyinDao extends BaseDao<EventreportPingyinEntity> {
+	
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridInfoPingyinDao.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.GridInfoPingyinEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 平阴区网格表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Mapper
+public interface GridInfoPingyinDao extends BaseDao<GridInfoPingyinEntity> {
+	
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridstaffInfoPingyinDao.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.GridstaffInfoPingyinEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 平阴区网格员基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Mapper
+public interface GridstaffInfoPingyinDao extends BaseDao<GridstaffInfoPingyinEntity> {
+	
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridstaffWorkInfoPingyinDao.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.GridstaffWorkInfoPingyinEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 平阴区网格员例行工作信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Mapper
+public interface GridstaffWorkInfoPingyinDao extends BaseDao<GridstaffWorkInfoPingyinEntity> {
+	
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java

@@ -0,0 +1,195 @@
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 平阴区事件上报中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("eventreport_pingyin")
+public class EventreportPingyinEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据库主键自增字段，请勿指定
+     */
+	private Long id;
+
+    /**
+     * 上报区县代码，参照6位行政区划代码
+     */
+	private String qxBm;
+
+    /**
+     * 上报区县名称
+     */
+	private String qxMc;
+
+    /**
+     * 网格编码,参照《山东省社会治理网格化智能工作平台数据标准》
+     */
+	private String gridCode;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 事件编号，可以使用区县系统中的事件唯一识别码
+     */
+	private String eventCode;
+
+    /**
+     * 事件名称
+     */
+	private String eventName;
+
+    /**
+     * 事件类别,参照《山东省社会治理网格化智能工作平台数据标准》10.19
+     */
+	private String eventCategory;
+
+    /**
+     * 上报网格员姓名
+     */
+	private String gridUserName;
+
+    /**
+     * 上报网格员的身份证号码
+     */
+	private String gridUserCardid;
+
+    /**
+     * 事件上报时间
+     */
+	private Date reportTime;
+
+    /**
+     * 事件发生时间
+     */
+	private Date happenTime;
+
+    /**
+     * 事件发生地点描述
+     */
+	private String happenPlace;
+
+    /**
+     * 事件简述，详细一些，文字数量不少于10字
+     */
+	private String eventDescription;
+
+    /**
+     * 事件办结方式，符合《标准》10.20
+     */
+	private String waysOfResolving;
+
+    /**
+     * 是否办结，填写Y、N（Y 是  N 否）
+     */
+	private String successfulOrNo;
+
+    /**
+     * 办结层级，符合《标准》10.21
+     */
+	private String completeLevel;
+
+    /**
+     * 办结时间，办结后填写
+     */
+	private Date completeTime;
+
+    /**
+     * 事件发生位置经度，wgs84坐标系，请勿用火星坐标系，不得跑出辖区
+     */
+	private BigDecimal lng;
+
+    /**
+     * 事件发生位置纬度，wgs84坐标系，请勿用火星坐标系，不得跑出辖区
+     */
+	private BigDecimal lat;
+
+    /**
+     * 事件主要当事人姓名
+     */
+	private String name;
+
+    /**
+     * 事件涉及人数
+     */
+	private Integer numberInvolved;
+
+    /**
+     * 事件涉及单位名称
+     */
+	private String relatedUnites;
+
+    /**
+     * 出租人姓名
+     */
+	private String lessorName;
+
+    /**
+     * 出租屋巡查结果，符合《标准》10.24
+     */
+	private String rentingResult;
+
+    /**
+     * 重点场所类别，符合《标准》10.25
+     */
+	private String keyAreaType;
+
+    /**
+     * 宗教活动规模，符合《标准》10.26
+     */
+	private String religionScale;
+
+    /**
+     * 宗教类别，符合《标准》10.27
+     */
+	private String religionType;
+
+    /**
+     * 重点场所是否变动，填写Y、N（Y 是  N 否）
+     */
+	private String isKeyareaState;
+
+    /**
+     * 重点人员是否在当地，填写Y、N（Y 是  N 否）
+     */
+	private String isKeypeopleLocate;
+
+    /**
+     * 重点人员现状描述
+     */
+	private String keypeopleStatus;
+
+    /**
+     * 例行工作编辑插入、更新时间,县市区填写
+     */
+	private Date updateTime;
+
+    /**
+     * 事件是否删除，Y：是、N：否
+     */
+	private String isDel;
+
+    /**
+     * 入库时间，自动生成，请勿设置
+     */
+	private Date recoredInsertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java

@@ -0,0 +1,105 @@
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 平阴区网格表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("grid_info_pingyin")
+public class GridInfoPingyinEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据库主键自增字段，请勿指定
+     */
+	private Long id;
+
+    /**
+     * 上报区县代码，参照6位行政区划代码
+     */
+	private String qxBm;
+
+    /**
+     * 上报区县名称
+     */
+	private String qxMc;
+
+    /**
+     * 网格编码，参照《标准》
+     */
+	private String gridCode;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格层级，应符合10.1组织层级，所有层级上报
+     */
+	private Integer gridLevel;
+
+    /**
+     * 专属网格类型，应符合10.28专属网格类型
+     */
+	private String gridType;
+
+    /**
+     * 网格内人口规模，如果为农村和城市网格，字段必填，应符合10.29.网格内人口规模
+     */
+	private String populationSize;
+
+    /**
+     * 是否成立网格党支部或网格党小组，Y：是、N：否
+     */
+	private String isPartyBranch;
+
+    /**
+     * 网格党组织类型，是否成立党支部或党小组为是，此项必填。应符合10.37网格党组织类型。
+     */
+	private String partyBranchType;
+
+    /**
+     * 网格中心点的经度
+     */
+	private BigDecimal lng;
+
+    /**
+     * 网格中心点纬度
+     */
+	private BigDecimal lat;
+
+    /**
+     * 网格颜色，如 #000000
+     */
+	private String gridColor;
+
+    /**
+     * 网格信息编辑插入、更新时间，,县市区填写
+     */
+	private Date updateTime;
+
+    /**
+     * 此网格是否删除，Y：是、N：否
+     */
+	private String isDel;
+
+    /**
+     * 入库时间，自动生成，请勿设置
+     */
+	private Date recoredInsertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridstaffInfoPingyinEntity.java

@@ -0,0 +1,159 @@
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 平阴区网格员基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("gridstaff_info_pingyin")
+public class GridstaffInfoPingyinEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据库主键自增字段，请勿指定
+     */
+	private Long id;
+
+    /**
+     * 上报区县代码，参照6位行政区划代码
+     */
+	private String qxBm;
+
+    /**
+     * 上报区县名称
+     */
+	private String qxMc;
+
+    /**
+     * 区县系统中的网格员唯一编码
+     */
+	private String gridUserId;
+
+    /**
+     * 网格编码
+     */
+	private String gridCode;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格员姓名
+     */
+	private String nickName;
+
+    /**
+     * 网格员身份证号码
+     */
+	private String cardNum;
+
+    /**
+     * 网格员类型，符合《标准》10.3
+     */
+	private String userType;
+
+    /**
+     * 网格员手机号
+     */
+	private String phonenumber;
+
+    /**
+     * 网格员性别，应符合10.31中性别,不要有 其他
+     */
+	private String sex;
+
+    /**
+     * 网格员民族，应符合10.32中民族
+     */
+	private String nation;
+
+    /**
+     * 网格员政治面貌，符合GB/T 4762
+     */
+	private String paerty;
+
+    /**
+     * 网格员出生日期
+     */
+	private Date birthday;
+
+    /**
+     * 网格员学历，符合GB/T4658，博士、研究生会进行预警
+     */
+	private String education;
+
+    /**
+     * 入职时间，格式为“YYYY-MM-DD” 
+     */
+	private Date entryDate;
+
+    /**
+     * 是否离职，格式为Y：是、N：否
+     */
+	private String isLeave;
+
+    /**
+     * 离职时间，格式为“YYYY-MM-DD” 
+     */
+	private Date leaveDate;
+
+    /**
+     * 网格员年收入，含福利、补贴和保险等，应符合10.30中的网格员年收入，专职低于1w5、兼职大于3w会预警
+     */
+	private String income;
+
+    /**
+     * 是否社区（村）两委委员,Y：是、N：否
+     */
+	private String isCommittee;
+
+    /**
+     * 是否社区工作者,Y：是、N：否
+     */
+	private String isCommunityWorkers;
+
+    /**
+     * 是否社会工作者,Y：是、N：否
+     */
+	private String isSocialWorker;
+
+    /**
+     * 是否村（居）民小组长,Y：是、N：否
+     */
+	private String isVillageLeader;
+
+    /**
+     * 是否警务助理,Y：是、N：否
+     */
+	private String isPoliceAssistant;
+
+    /**
+     * 是否人民调解员,Y：是、N：否
+     */
+	private String isMediator;
+
+    /**
+     * 网格员信息编辑插入、更新时间，,县市区填写
+     */
+	private Date updateTime;
+
+    /**
+     * 入库时间，自动生成，请勿设置
+     */
+	private Date recoredInsertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridstaffWorkInfoPingyinEntity.java

@@ -0,0 +1,89 @@
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 平阴区网格员例行工作信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("gridstaff_work_info_pingyin")
+public class GridstaffWorkInfoPingyinEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 上报区县代码，参照6位行政区划代码
+     */
+	private String qxBm;
+
+    /**
+     * 上报区县名称
+     */
+	private String qxMc;
+
+    /**
+     * 网格编码
+     */
+	private String gridCode;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 例行工作类型,应符合10.27中的例行工作类型
+     */
+	private String workType;
+
+    /**
+     * 发生日期,格式为“YYYY-MM-DD”
+     */
+	private Date happenTime;
+
+    /**
+     * 基础信息主键,出租房巡查、重点场所巡查、刑满释放人员、社区矫正、吸毒人员、信访人员重点青少年和精神障碍者必填
+     */
+	private Integer baseInfoId;
+
+    /**
+     * 有无变动（异常）,Y：是、N：否
+     */
+	private String workResult;
+
+    /**
+     * 说明
+     */
+	private String workContent;
+
+    /**
+     * 例行工作编辑插入、更新时间，,县市区填写
+     */
+	private Date updateTime;
+
+    /**
+     * 例行工作是否删除，Y：是、N：否
+     */
+	private String isDel;
+
+    /**
+     * 入库时间，自动生成，请勿设置
+     */
+	private Date recoredInsertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/EventreportPingyinService.java

@@ -0,0 +1,14 @@
+package com.epmet.opendata.service;
+
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.EventreportPingyinEntity;
+
+/**
+ * 平阴区事件上报中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+public interface EventreportPingyinService extends BaseService<EventreportPingyinEntity> {
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GridInfoPingyinService.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.GridInfoPingyinEntity;
+
+import java.util.Map;
+
+/**
+ * 平阴区网格表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+public interface GridInfoPingyinService extends BaseService<GridInfoPingyinEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GridstaffInfoPingyinService.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.GridstaffInfoPingyinEntity;
+
+import java.util.Map;
+
+/**
+ * 平阴区网格员基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+public interface GridstaffInfoPingyinService extends BaseService<GridstaffInfoPingyinEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GridstaffWorkInfoPingyinService.java

@@ -0,0 +1,16 @@
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.GridstaffWorkInfoPingyinEntity;
+
+import java.util.Map;
+
+/**
+ * 平阴区网格员例行工作信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+public interface GridstaffWorkInfoPingyinService extends BaseService<GridstaffWorkInfoPingyinEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java

@@ -0,0 +1,19 @@
+package com.epmet.opendata.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.EventreportPingyinDao;
+import com.epmet.opendata.entity.EventreportPingyinEntity;
+import com.epmet.opendata.service.EventreportPingyinService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 平阴区事件上报中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Service
+public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPingyinDao, EventreportPingyinEntity> implements EventreportPingyinService {
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java

@@ -0,0 +1,19 @@
+package com.epmet.opendata.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.GridInfoPingyinDao;
+import com.epmet.opendata.entity.GridInfoPingyinEntity;
+import com.epmet.opendata.service.GridInfoPingyinService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 平阴区网格表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Service
+public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinDao, GridInfoPingyinEntity> implements GridInfoPingyinService {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.GridstaffInfoPingyinDao;
+import com.epmet.opendata.entity.GridstaffInfoPingyinEntity;
+import com.epmet.opendata.service.GridstaffInfoPingyinService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 平阴区网格员基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Service
+public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffInfoPingyinDao, GridstaffInfoPingyinEntity> implements GridstaffInfoPingyinService {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.GridstaffWorkInfoPingyinDao;
+import com.epmet.opendata.entity.GridstaffWorkInfoPingyinEntity;
+import com.epmet.opendata.service.GridstaffWorkInfoPingyinService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 平阴区网格员例行工作信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-22
+ */
+@Service
+public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffWorkInfoPingyinDao, GridstaffWorkInfoPingyinEntity> implements GridstaffWorkInfoPingyinService {
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml

@@ -0,0 +1,44 @@
+<?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.epmet.opendata.dao.EventreportPingyinDao">
+
+    <resultMap type="com.epmet.opendata.entity.EventreportPingyinEntity" id="eventreportPingyinMap">
+        <result property="id" column="id"/>
+        <result property="qxBm" column="qx_bm"/>
+        <result property="qxMc" column="qx_mc"/>
+        <result property="gridCode" column="grid_code"/>
+        <result property="gridName" column="grid_name"/>
+        <result property="eventCode" column="event_code"/>
+        <result property="eventName" column="event_name"/>
+        <result property="eventCategory" column="event_category"/>
+        <result property="gridUserName" column="grid_user_name"/>
+        <result property="gridUserCardid" column="grid_user_cardid"/>
+        <result property="reportTime" column="report_time"/>
+        <result property="happenTime" column="happen_time"/>
+        <result property="happenPlace" column="happen_place"/>
+        <result property="eventDescription" column="event_description"/>
+        <result property="waysOfResolving" column="ways_of_resolving"/>
+        <result property="successfulOrNo" column="successful_or_no"/>
+        <result property="completeLevel" column="complete_level"/>
+        <result property="completeTime" column="complete_time"/>
+        <result property="lng" column="lng"/>
+        <result property="lat" column="lat"/>
+        <result property="name" column="name"/>
+        <result property="numberInvolved" column="number_involved"/>
+        <result property="relatedUnites" column="related_unites"/>
+        <result property="lessorName" column="lessor_name"/>
+        <result property="rentingResult" column="renting_result"/>
+        <result property="keyAreaType" column="key_area_type"/>
+        <result property="religionScale" column="religion_scale"/>
+        <result property="religionType" column="religion_type"/>
+        <result property="isKeyareaState" column="is_keyarea_state"/>
+        <result property="isKeypeopleLocate" column="is_keypeople_locate"/>
+        <result property="keypeopleStatus" column="keypeople_status"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDel" column="is_del"/>
+        <result property="recoredInsertTime" column="recored_insert_time"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml

@@ -0,0 +1,26 @@
+<?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.epmet.opendata.dao.GridInfoPingyinDao">
+
+    <resultMap type="com.epmet.opendata.entity.GridInfoPingyinEntity" id="gridInfoPingyinMap">
+        <result property="id" column="id"/>
+        <result property="qxBm" column="qx_bm"/>
+        <result property="qxMc" column="qx_mc"/>
+        <result property="gridCode" column="grid_code"/>
+        <result property="gridName" column="grid_name"/>
+        <result property="gridLevel" column="grid_level"/>
+        <result property="gridType" column="GRID_TYPE"/>
+        <result property="populationSize" column="POPULATION_SIZE"/>
+        <result property="isPartyBranch" column="IS_PARTY_BRANCH"/>
+        <result property="partyBranchType" column="PARTY_BRANCH_TYPE"/>
+        <result property="lng" column="lng"/>
+        <result property="lat" column="lat"/>
+        <result property="gridColor" column="grid_color"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDel" column="is_del"/>
+        <result property="recoredInsertTime" column="recored_insert_time"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml

@@ -0,0 +1,37 @@
+<?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.epmet.opendata.dao.GridstaffInfoPingyinDao">
+
+    <resultMap type="com.epmet.opendata.entity.GridstaffInfoPingyinEntity" id="gridstaffInfoPingyinMap">
+        <result property="id" column="id"/>
+        <result property="qxBm" column="qx_bm"/>
+        <result property="qxMc" column="qx_mc"/>
+        <result property="gridUserId" column="grid_user_id"/>
+        <result property="gridCode" column="grid_code"/>
+        <result property="gridName" column="grid_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="cardNum" column="card_num"/>
+        <result property="userType" column="user_type"/>
+        <result property="phonenumber" column="phonenumber"/>
+        <result property="sex" column="sex"/>
+        <result property="nation" column="nation"/>
+        <result property="paerty" column="paerty"/>
+        <result property="birthday" column="birthday"/>
+        <result property="education" column="education"/>
+        <result property="entryDate" column="ENTRY_DATE"/>
+        <result property="isLeave" column="IS_LEAVE"/>
+        <result property="leaveDate" column="LEAVE_DATE"/>
+        <result property="income" column="INCOME"/>
+        <result property="isCommittee" column="IS_COMMITTEE"/>
+        <result property="isCommunityWorkers" column="IS_COMMUNITY_WORKERS"/>
+        <result property="isSocialWorker" column="IS_SOCIAL_WORKER"/>
+        <result property="isVillageLeader" column="IS_VILLAGE_LEADER"/>
+        <result property="isPoliceAssistant" column="IS_POLICE_ASSISTANT"/>
+        <result property="isMediator" column="IS_MEDIATOR"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="recoredInsertTime" column="recored_insert_time"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml

@@ -0,0 +1,23 @@
+<?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.epmet.opendata.dao.GridstaffWorkInfoPingyinDao">
+
+    <resultMap type="com.epmet.opendata.entity.GridstaffWorkInfoPingyinEntity" id="gridstaffWorkInfoPingyinMap">
+        <result property="id" column="id"/>
+        <result property="qxBm" column="qx_bm"/>
+        <result property="qxMc" column="qx_mc"/>
+        <result property="gridCode" column="GRID_CODE"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="workType" column="WORK_TYPE"/>
+        <result property="happenTime" column="HAPPEN_TIME"/>
+        <result property="baseInfoId" column="BASE_INFO_ID"/>
+        <result property="workResult" column="WORK_RESULT"/>
+        <result property="workContent" column="WORK_CONTENT"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDel" column="is_del"/>
+        <result property="recoredInsertTime" column="recored_insert_time"/>
+    </resultMap>
+
+
+</mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java

@@ -138,4 +138,10 @@ public class CustomerStaffDTO implements Serializable {
 	 * 登录密码
 	 */
 	private String password;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridStaffUploadtFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @description: 网格工作人员数据上报-查询客户网格下有效工作人员信息数据
+ * @author: sun
+ */
+@NoArgsConstructor
+@Data
+public class GridStaffUploadtFormDTO {
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUploadResultDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description: 网格工作人员数据上报-查询客户网格下有效工作人员信息数据
+ * @author: sun
+ */
+@Data
+public class GridStaffUploadResultDTO {
+    /**
+     * 区县系统中的网格员唯一编码
+     */
+    private String gridUserId;
+
+    /**
+     * 网格员姓名
+     */
+    private String nickName;
+
+    /**
+     * 网格员身份证号码
+     */
+    private String cardNum;
+
+    /**
+     * 网格员手机号
+     */
+    private String phonenumber;
+
+    /**
+     * 网格员性别，应符合10.31中性别,不要有 其他
+     */
+    private String sex;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -846,4 +846,7 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icResiUserDataSync/icDataSyncTask")
     Result<Boolean> icDataSyncTask(String customerId);
+
+    @PostMapping("/epmetuser/customerstaff/customerstaff")
+    Result<List<GridStaffUploadResultDTO>> customerStaff(@RequestBody GridStaffUploadtFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -641,4 +641,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "icDataSyncTask", customerId);
     }
 
+    @Override
+    public Result<List<GridStaffUploadResultDTO>> customerStaff(GridStaffUploadtFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerStaff", formDTO);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -493,5 +493,14 @@ public class CustomerStaffController {
         return new Result<List<GridMobileListResultDTO>>().ok(customerStaffService.gridMobileList(formDTO.getGridId(), tokenDto.getUserId()));
     }
 
+    /**
+     * @Author sun
+     * @Description  网格工作人员数据上报-查询客户网格下有效工作人员信息数据
+     **/
+    @PostMapping(value = "customerstaff")
+    public Result<List<GridStaffUploadResultDTO>> customerStaff(@RequestBody GridStaffUploadtFormDTO formDTO) {
+        return new Result<List<GridStaffUploadResultDTO>>().ok(customerStaffService.customerStaff(formDTO));
+    }
+
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -229,4 +229,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 工作人员基本信息
 	 **/
     List<GridMobileListResultDTO> gridStaffMobileList(List<String> staffIdList);
+
+	List<GridStaffUploadResultDTO> getStaffByCustomerId(@Param("customerId") String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java

@@ -101,4 +101,9 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
 	 * 登录密码
 	 */
 	private String password;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -347,4 +347,6 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Description 【事件】网格员服务电话
 	 **/
     List<GridMobileListResultDTO> gridMobileList(String gridId, String userId);
+
+    List<GridStaffUploadResultDTO> customerStaff(GridStaffUploadtFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -856,4 +856,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return resultList;
     }
 
+    @Override
+    public List<GridStaffUploadResultDTO> customerStaff(GridStaffUploadtFormDTO formDTO) {
+        //1.查询客户下有效工作人员信息
+        return baseDao.getStaffByCustomerId(formDTO.getCustomerId());
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -456,4 +456,19 @@
     </select>
     <select id="gridStaffMobileList" resultType="com.epmet.dto.result.GridMobileListResultDTO"></select>
 
+    <select id="getStaffByCustomerId" resultType="com.epmet.dto.result.GridStaffUploadResultDTO">
+        SELECT
+            user_id gridUserId,
+            real_name nickName,
+            id_card cardNum,
+            gender sex,
+            mobile phonenumber
+        FROM
+            customer_staff
+        WHERE
+            del_flag = '0'
+        AND enable_flag = 'enable'
+        AND customer_id = #{customerId}
+    </select>
+
 </mapper>