网格员信息表表后台代码提交

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.consult.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.IdentityNoUtils;
 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;
@@ -53,7 +54,7 @@ public class GridOperatorInfoController {
 
     @GetMapping("page")
     public Result<PageData<GridOperatorInfoDTO>> page(@RequestParam Map<String, Object> params) {
-        PageData<GridOperatorInfoDTO> page = gridOperatorInfoService.page(params);
+        PageData<GridOperatorInfoDTO> page = gridOperatorInfoService.getEnterpriseInfoPageFromPc(params);
         return new Result<PageData<GridOperatorInfoDTO>>().ok(page);
     }
 
@@ -67,6 +68,11 @@ public class GridOperatorInfoController {
     public Result save(@RequestBody GridOperatorInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        //校验身份证
+        String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo());
+        if (idenNoMsg != null) {
+            return new Result().error(idenNoMsg);
+        }
         dto.setShowFlag("0");
         gridOperatorInfoService.save(dto);
         return new Result();

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorInfoDao.java

@@ -18,11 +18,15 @@
 package com.elink.esua.epdc.modules.consult.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
 import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
 import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 import java.util.List;
 
 /**
@@ -34,6 +38,16 @@ import java.util.List;
 @Mapper
 public interface GridOperatorInfoDao extends BaseDao<GridOperatorInfoEntity> {
 
+    /**
+     * @return java.util.List<com.elink.esua.epdc.modules.consult.entity.GridOperatorInfoEntity>
+     * @Description pc查询网格员信息列表
+     * @Author songyunpeng
+     * @Date 2020/3/3
+     * @Param [params]
+     **/
+    List<GridOperatorInfoDTO> selectGridOperatorInfoPageFromPc(Map<String, Object> params);
+
+
     /***
      * 获取网格内网格员公示信息
      * @param

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridOperatorInfoService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
+import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
 import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorInfoEntity;
@@ -95,15 +96,25 @@ public interface GridOperatorInfoService extends BaseService<GridOperatorInfoEnt
      * @date 2020-03-02
      */
     void delete(String[] ids);
+
     /**
+     * @return void
      * @Description 是否展示
      * @Author songyunpeng
      * @Date 2020/3/2
      * @Param [dto]
-     * @return void
      **/
     void changeShowFlag(GridOperatorInfoDTO dto);
 
+    /**
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO>
+     * @Description pc网格员列表
+     * @Author songyunpeng
+     * @Date 2020/3/3
+     * @Param [params]
+     **/
+    PageData<GridOperatorInfoDTO> getEnterpriseInfoPageFromPc(Map<String, Object> params);
+
     /***
      * 获取网格内网格员公示信息
      * @param

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
+import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
 import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.dao.GridOperatorInfoDao;
@@ -152,6 +153,13 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
         updateById(gridOperatorInfoEntity);
     }
 
+    @Override
+    public PageData<GridOperatorInfoDTO> getEnterpriseInfoPageFromPc(Map<String, Object> params) {
+        IPage<GridOperatorInfoDTO> page = getPage(params);
+        List<GridOperatorInfoDTO> list = baseDao.selectGridOperatorInfoPageFromPc(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorInfoDao.xml

@@ -27,6 +27,25 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+
+    <select id="selectGridOperatorInfoPageFromPc" resultType="com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO">
+        select * from epdc_grid_operator_info t
+        where DEL_FLAG = '0'
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (find_in_set(#{gridId},PARENT_DEPT_IDS)
+            OR find_in_set(#{gridId},ALL_DEPT_IDS))
+        </if>
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
     <select id="selectListGridOperator" resultType="com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO">
         SELECT
         *,ec.DUTY_CATEGORY_NAME