diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index f078bd4bb6..77818b2916 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -76,6 +76,7 @@ public enum EpmetErrorCode {
 	SET_PARENT_AREA_CODE(8210,"请先设置上级组织区划"),
 	HAVE_GUIDE_CANNOT_DEL(8211,"当前分类已经存在办事指南，不允许删除"),
 	GUIDE_CATEGORY_NAME_EXITS(8212,"分类已存在"),
+	CUSTOMER_FORM_NOT_EXITS(8213,"客户未配置表单"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java
index 2e66799c15..e2bafc12df 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java
@@ -15,5 +15,9 @@ public class CustomerFormQueryDTO implements Serializable {
     public interface AddUserInternalGroup {}
     @NotBlank(message = "formCode不能为空,居民信息默认传:resi_base_info",groups =AddUserInternalGroup.class )
     private String formCode;
+
+
+    @NotBlank(message = "tokenDto获取customerId不能为空",groups =AddUserInternalGroup.class )
+    private String customerId;
 }
 
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem.java
index 2059997cc8..9a65bb0b16 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItem.java
@@ -103,6 +103,11 @@ public class FormItem implements Serializable {
      */
     private String columnName;
 
+    /**
+     * 列名序号，根据表递增
+     */
+    private Integer columnNum;
+
     private List<OptionDTO> options;
 
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java
index bb876ffa7a..d89f303291 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -103,7 +105,8 @@ public class IcFormController {
      * @date 2021/10/26 2:40 下午
      */
     @PostMapping("getcustomerform")
-    public Result<CustomerFormResultDTO> getCustomerForm(@RequestBody CustomerFormQueryDTO formDto){
+    public Result<CustomerFormResultDTO> getCustomerForm(@LoginUser TokenDto tokenDto, @RequestBody CustomerFormQueryDTO formDto){
+        formDto.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class);
         return new Result<CustomerFormResultDTO>().ok(icFormService.getCustomerForm(formDto));
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
index fd40647a83..1b2ffe357c 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
@@ -18,8 +18,15 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.CustomerFormResultDTO;
+import com.epmet.dto.result.FormGroupDTO;
+import com.epmet.dto.result.FormItem;
+import com.epmet.dto.result.OptionDTO;
 import com.epmet.entity.IcFormEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 配置表单
@@ -29,5 +36,21 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcFormDao extends BaseDao<IcFormEntity> {
-	
+    /**
+     * 查询表单
+     *
+     * @param customerId
+     * @param formCode
+     * @return  com.epmet.dto.result.CustomerFormResultDTO
+     * @author yinzuomei
+     * @date 2021/10/26 2:48 下午
+     */
+    CustomerFormResultDTO selectByCode(@Param("customerId") String customerId, @Param("formCode") String formCode);
+
+    List<FormItem> selectItemList(String formId);
+
+    List<FormItem> selectItemListByGroupId(String groupId);
+    List<OptionDTO> selectListOption(String itemId);
+
+    List<FormGroupDTO> selectListGroup(String formId);
 }
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
index 7c476eddd8..03b03ffaf8 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
@@ -21,12 +21,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormDao;
 import com.epmet.dto.IcFormDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
+import com.epmet.dto.result.FormGroupDTO;
+import com.epmet.dto.result.FormItem;
 import com.epmet.entity.IcFormEntity;
 import com.epmet.service.IcFormService;
 import org.apache.commons.lang3.StringUtils;
@@ -110,7 +114,16 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
     @Override
     public CustomerFormResultDTO getCustomerForm(CustomerFormQueryDTO formDto) {
         //todo
-        return null;
+        CustomerFormResultDTO resultDTO=baseDao.selectByCode(formDto.getCustomerId(),formDto.getFormCode());
+        if (null == resultDTO) {
+            throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(),EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg());
+        }
+        List<FormItem> itemList=baseDao.selectItemList(resultDTO.getFormId());
+        List<FormGroupDTO> groupList=baseDao.selectListGroup(resultDTO.getFormId());
+
+        resultDTO.setItemList(itemList);
+        resultDTO.setGroupList(groupList);
+        return resultDTO;
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
index 8b0bb1f336..8c872f115d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
@@ -3,5 +3,143 @@
 
 <mapper namespace="com.epmet.dao.IcFormDao">
 
+    <!-- 查询表单   -->
+    <select id="selectByCode" parameterType="map" resultType="com.epmet.dto.result.CustomerFormResultDTO">
+        SELECT
+            f.id AS formId,
+            f.FORM_NAME AS formName
+        FROM
+            ic_form f
+        WHERE
+            f.DEL_FLAG = '0'
+          AND f.CUSTOMER_ID = #{customerId}
+          AND f.FORM_CODE = #{formCode}
+    </select>
+
+
+    <resultMap id="FormItemMap" type="com.epmet.dto.result.FormItem">
+        <id property="itemId" column="item_id" ></id>
+        <result property="tableName" column="table_name"/>
+        <result property="parentItemId" column="PARENT_ITEM_ID"/>
+        <result property="label" column="LABEL"/>
+        <result property="itemType" column="ITEM_TYPE"/>
+        <result property="itemGroupId" column="ITEM_GROUP_ID"/>
+        <result property="required" column="REQUIRED"/>
+        <result property="validType" column="VALID_TYPE"/>
+        <result property="defaultValue" column="DEFAULT_VALUE"/>
+        <result property="optionSourceType" column="OPTION_SOURCE_TYPE"/>
+        <result property="optionSourceValue" column="OPTION_SOURCE_VALUE"/>
+        <result property="sort" column="SORT"/>
+        <result property="placeholder" column="PLACEHOLDER"/>
+        <result property="searchDisplay" column="SEARCH_DISPLAY"/>
+        <result property="listDisplay" column="LIST_DISPLAY"/>
+        <result property="dataAnalyse" column="DATA_ANALYSE"/>
+        <result property="columnName" column="COLUMN_NAME"/>
+        <result property="columnNum" column="COLUMN_NUM"/>
+        <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
+             column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
+            <result property="label" column=""/>
+            <result property="value" column="url"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectListOption" parameterType="java.lang.String" resultType="com.epmet.dto.result.OptionDTO">
+        SELECT
+            i.OPTION_LABEL as label,
+            i.OPTION_VALUE as value
+        FROM
+            ic_form_item_options i
+        WHERE
+            i.DEL_FLAG = '0'
+          AND i.ITEM_ID = #{itemId}
+        ORDER BY
+            i.SORT ASC
+    </select>
+
+    <select id="selectItemList" parameterType="java.lang.String" resultMap="FormItemMap">
+        SELECT
+            fi.ID AS item_id,
+            'ic_resi_user' AS table_name,
+            fi.PARENT_ITEM_ID,
+            fi.LABEL,
+            fi.ITEM_TYPE,
+            fi.ITEM_GROUP_ID,
+            fi.REQUIRED,
+            fi.VALID_TYPE,
+            fi.DEFAULT_VALUE,
+            fi.OPTION_SOURCE_TYPE,
+            fi.OPTION_SOURCE_VALUE,
+            fi.SORT,
+            fi.PLACEHOLDER,
+            fi.SEARCH_DISPLAY,
+            fi.LIST_DISPLAY,
+            fi.DATA_ANALYSE,
+            fi.COLUMN_NAME
+        FROM
+            ic_form_item fi
+        WHERE
+            fi.DEL_FLAG = '0'
+          AND fi.FORM_ID = #{formId}
+          AND fi.ITEM_GROUP_ID = 'none'
+        ORDER BY
+            fi.SORT ASC
+    </select>
+
+
+    <resultMap id="FormGroupDTOMap" type="com.epmet.dto.result.FormGroupDTO">
+        <id property="groupId" column="group_id" ></id>
+        <result property="label" column="LABEL"/>
+        <result property="sort" column="sort"/>
+        <result property="supportAdd" column="SUPPORT_ADD"/>
+        <result property="tableName" column="TABLE_NAME"/>
+        <collection property="itemList" ofType="com.epmet.dto.result.FormItem"
+                    column="group_id"  select="com.epmet.dao.IcFormDao.selectItemListByGroupId">
+        </collection>
+    </resultMap>
+
+    <select id="selectItemListByGroupId" parameterType="java.lang.String" resultMap="FormItemMap">
+        SELECT
+            fi.ID AS item_id,
+            'ic_resi_user' AS table_name,
+            fi.PARENT_ITEM_ID,
+            fi.LABEL,
+            fi.ITEM_TYPE,
+            fi.ITEM_GROUP_ID,
+            fi.REQUIRED,
+            fi.VALID_TYPE,
+            fi.DEFAULT_VALUE,
+            fi.OPTION_SOURCE_TYPE,
+            fi.OPTION_SOURCE_VALUE,
+            fi.SORT,
+            fi.PLACEHOLDER,
+            fi.SEARCH_DISPLAY,
+            fi.LIST_DISPLAY,
+            fi.DATA_ANALYSE,
+            fi.COLUMN_NAME
+        FROM
+            ic_form_item fi
+        WHERE
+            fi.DEL_FLAG = '0'
+          AND fi.ITEM_GROUP_ID = #{groupId}
+        ORDER BY
+            fi.SORT ASC
+    </select>
+
+    <select id="selectListGroup" parameterType="java.lang.String" resultMap="FormGroupDTOMap">
+        SELECT
+            g.id AS group_id,
+            g.LABEL,
+            g.sort,
+            g.SUPPORT_ADD,
+            'ic_resi_user' AS TABLE_NAME
+        FROM
+            ic_form_item_group g
+        WHERE
+            g.DEL_FLAG = '0'
+          AND g.FORM_ID = #{formId}
+          AND g.DISPLAY = '1'
+        ORDER BY
+            g.SORT ASC
+    </select>
 
 </mapper>
\ No newline at end of file