Merge remote-tracking branch 'origin/dev_resi_export' into develop

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

@@ -85,6 +85,16 @@ public class IcBuildingDTO implements Serializable {
      */
 	private Integer totalHouseNum;
 
+    /**
+     * 楼长姓名
+     */
+	private String buildingLeaderName;
+
+    /**
+     * 楼长电话
+     */
+	private String buildingLeaderMobile;
+
     /**
      * 中心点位：经度
      */

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

@@ -73,6 +73,11 @@ public class IcHouseDTO implements Serializable {
      */
 	private String doorName;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
     /**
      * 房屋类型，这里存储字典value就可以
      */

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

@@ -45,6 +45,16 @@ public class ImportGeneralDTO implements Serializable {
     private String buildingName;
     private String buildingId;
 
+    /**
+     * 楼长姓名
+     */
+    private String buildingLeaderName;
+
+    /**
+     * 楼长电话
+     */
+    private String buildingLeaderMobile;
+
     /**
      * 房屋类型
      */
@@ -152,4 +162,9 @@ public class ImportGeneralDTO implements Serializable {
      * 小区重复状态
      */
     private Boolean neighborHoodExistStatus = false;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
 }

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

@@ -123,6 +123,16 @@ public class IcBulidingAddFormDTO implements Serializable {
 
     private String latitude;
 
+    /**
+     * 楼长姓名
+     */
+    private String buildingLeaderName;
+
+    /**
+     * 楼长电话
+     */
+    private String buildingLeaderMobile;
+
 
 
 

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

@@ -41,4 +41,14 @@ public class IcBuildingListResultDTO extends PageFormDTO {
     private Integer totalUnitNum;
     private String longitude;
     private String buildingType;
+
+    /**
+     * 楼长姓名
+     */
+    private String buildingLeaderName;
+
+    /**
+     * 楼长电话
+     */
+    private String buildingLeaderMobile;
 }

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

@@ -96,7 +96,6 @@ public class BuildingController {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, IcBulidingAddFormDTO.UpdateShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
-//        String customerId = "123123";
         buildingService.updateBuilding(customerId,formDTO);
         return new Result().ok("修改成功");
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java

@@ -80,6 +80,16 @@ public class IcBuildingEntity extends BaseEpmetEntity {
      */
 	private Integer totalHouseNum;
 
+	/**
+	 * 楼长姓名
+	 */
+	private String buildingLeaderName;
+
+	/**
+	 * 楼长电话
+	 */
+	private String buildingLeaderMobile;
+
     /**
      * 中心点位：经度
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -73,6 +73,11 @@ public class IcHouseEntity extends BaseEpmetEntity {
      */
 	private String doorName;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
     /**
      * 房屋类型，这里存储字典value就可以
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java

@@ -36,6 +36,12 @@ public class BuildingInfoModel {
     @ExcelProperty(value = "户数")
     private Integer totalHouseNum;
 
+    @ExcelProperty(value = "楼长姓名")
+    private String buildingLeaderName;
+
+    @ExcelProperty(value = "楼长电话")
+    private String buildingLeaderMobile;
+
     @ExcelIgnore
     private Integer num;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java

@@ -50,6 +50,9 @@ public class HouseInfoModel {
     @ExcelProperty(value = "房主身份证")
     private String ownerIdCard;
 
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
     @ExcelIgnore
     private Integer num;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -34,6 +34,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.epmet.constant.ImportErrorMsgConstants.*;
@@ -152,6 +154,11 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             disposeErrorMsg(info, "房主身份证的长度超出限制");
             return;
         }
+        if (null != data.getSort() && !isNumber(data.getSort().toString())){
+            nums.add(num);
+            disposeErrorMsg(info, "排序格式不正确");
+            return;
+        }
         /**
          * 2022-03-29 需求改动，单元号修改 eg 1 改为 1单元
          * 做限制，此字段中必须带有 "单元"2字，不存在就不给导入
@@ -205,6 +212,18 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
     }
 
+    public boolean isNumber(String str) {
+        if(str.length()>0) {
+            Pattern pattern = Pattern.compile("[0-9]*");
+            Matcher isNum = pattern.matcher(str);
+            if (!isNum.matches()) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
     public void disposeErrorMsg(HouseInfoModel data,String msg){
         HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class);
         err.setErrorMsg(msg);

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

@@ -426,14 +426,11 @@ public class BuildingServiceImpl implements BuildingService {
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
         }
-
         IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId());
-
         if (!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())) {
             //更新对应房屋小区id
             List<IcHouseEntity> icHouseEntities = icHouseDao.selectList(new QueryWrapper<IcHouseEntity>().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId()));
             if (!CollectionUtils.isEmpty(icHouseEntities)) {
-                //
                 throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(), "楼栋单元下存在房屋，无法更新");
             }
         }

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

@@ -603,6 +603,8 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         buildingEntity.setTotalUnitNum(info.getTotalUnitNum());
         buildingEntity.setTotalFloorNum(info.getTotalFloorNum());
         buildingEntity.setTotalHouseNum(info.getTotalHouseNum());
+        buildingEntity.setBuildingLeaderName(info.getBuildingLeaderName());
+        buildingEntity.setBuildingLeaderMobile(info.getBuildingLeaderMobile());
         icBuildingService.insert(buildingEntity);
         if (null != info.getTotalUnitNum() && info.getTotalUnitNum() > NumConstant.ZERO) {
             //设置楼宇单元

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.17__edit_building_and_house.sql

@@ -0,0 +1,3 @@
+alter table ic_building add COLUMN BUILDING_LEADER_NAME VARCHAR(11) comment '楼长姓名' AFTER TOTAL_HOUSE_NUM;
+alter table ic_building add COLUMN BUILDING_LEADER_MOBILE VARCHAR(11) comment '楼长电话' AFTER BUILDING_LEADER_NAME;
+alter table ic_house add COLUMN SORT INT(11) comment '排序' DEFAULT 0 AFTER DOOR_NAME;

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

@@ -82,7 +82,9 @@
         a.LONGITUDE as longitude,
         a.LATITUDE as latitude,
         a.TYPE as buildingTypeKey,
-        (SELECT COUNT(1) FROM ic_house WHERE DEL_FLAG = '0' AND BUILDING_ID = a.ID) AS realTotalHouseNum
+        (SELECT COUNT(1) FROM ic_house WHERE DEL_FLAG = '0' AND BUILDING_ID = a.ID) AS realTotalHouseNum,
+        a.BUILDING_LEADER_NAME,
+        a.BUILDING_LEADER_MOBILE
         from ic_building a
         LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID and b.DEL_FLAG='0'
         left join customer_agency c  on b.AGENCY_ID = c.ID and c.DEL_FLAG='0'

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java

@@ -0,0 +1,85 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Data
+public class IcExportTemplateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 表单CODE，从字典获取
+     */
+	private String formCode;
+
+    /**
+     * 模板名称
+     */
+	private String name;
+
+    /**
+     * 0:动态；1:文件
+     */
+	private Integer type;
+
+    /**
+     * 文件地址；http开头或者项目组模板存放相对路径
+     */
+	private String url;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 0未删除，1已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java

@@ -0,0 +1,62 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+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.DefaultGroup;
+import com.epmet.dto.IcExportTemplateDTO;
+import com.epmet.service.IcExportTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@RestController
+@RequestMapping("icExportTemplate")
+public class IcExportTemplateController {
+
+    @Autowired
+    private IcExportTemplateService icExportTemplateService;
+
+    @RequestMapping("page")
+    public Result<PageData<IcExportTemplateDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcExportTemplateDTO> page = icExportTemplateService.page(params);
+        return new Result<PageData<IcExportTemplateDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<IcExportTemplateDTO> get(@PathVariable("id") String id){
+        IcExportTemplateDTO data = icExportTemplateService.get(id);
+        return new Result<IcExportTemplateDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody IcExportTemplateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icExportTemplateService.save(dto);
+        return new Result();
+    }
+
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icExportTemplateService.delete(ids);
+        return new Result();
+    }
+
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateConfigDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcExportTemplateConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 自定义表单导出模板配置项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Mapper
+public interface IcExportTemplateConfigDao extends BaseDao<IcExportTemplateConfigEntity> {
+	
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcExportTemplateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Mapper
+public interface IcExportTemplateDao extends BaseDao<IcExportTemplateEntity> {
+	
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java

@@ -0,0 +1,56 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 自定义表单导出模板配置项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_export_template_config")
+public class IcExportTemplateConfigEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 模板主键id
+     */
+	private String tempId;
+
+    /**
+     * 父id
+     */
+	private String pid;
+
+    /**
+     * ic_form_item.id
+     */
+	private String formItemId;
+
+    /**
+     * 表头宽度
+     */
+	private Integer width;
+
+    /**
+     * 项标签
+     */
+	private String label;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateEntity.java

@@ -0,0 +1,54 @@
+package com.epmet.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-04-21
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_export_template")
+public class IcExportTemplateEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 表单CODE，从字典获取
+     */
+	private String formCode;
+
+    /**
+     * 模板名称
+     */
+	private String name;
+
+    /**
+     * 0:动态；1:文件
+     */
+	private Integer type;
+
+    /**
+     * 文件地址；http开头或者项目组模板存放相对路径
+     */
+	private String url;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java

@@ -0,0 +1,78 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcExportTemplateDTO;
+import com.epmet.entity.IcExportTemplateEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+public interface IcExportTemplateService extends BaseService<IcExportTemplateEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcExportTemplateDTO>
+     * @author generator
+     * @date 2022-04-21
+     */
+    PageData<IcExportTemplateDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcExportTemplateDTO>
+     * @author generator
+     * @date 2022-04-21
+     */
+    List<IcExportTemplateDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcExportTemplateDTO
+     * @author generator
+     * @date 2022-04-21
+     */
+    IcExportTemplateDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-21
+     */
+    void save(IcExportTemplateDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-21
+     */
+    void update(IcExportTemplateDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-04-21
+     */
+    void delete(String[] ids);
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -0,0 +1,83 @@
+package com.epmet.service.impl;
+
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcExportTemplateDao;
+import com.epmet.dto.IcExportTemplateDTO;
+import com.epmet.entity.IcExportTemplateEntity;
+import com.epmet.service.IcExportTemplateService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Service
+public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplateDao, IcExportTemplateEntity> implements IcExportTemplateService {
+
+
+    @Override
+    public PageData<IcExportTemplateDTO> page(Map<String, Object> params) {
+        IPage<IcExportTemplateEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcExportTemplateDTO.class);
+    }
+
+    @Override
+    public List<IcExportTemplateDTO> list(Map<String, Object> params) {
+        List<IcExportTemplateEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcExportTemplateDTO.class);
+    }
+
+    private QueryWrapper<IcExportTemplateEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcExportTemplateEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcExportTemplateDTO get(String id) {
+        IcExportTemplateEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcExportTemplateDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcExportTemplateDTO dto) {
+        IcExportTemplateEntity entity = ConvertUtils.sourceToTarget(dto, IcExportTemplateEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcExportTemplateDTO dto) {
+        IcExportTemplateEntity entity = ConvertUtils.sourceToTarget(dto, IcExportTemplateEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.21__addcol_item_build.sql

@@ -0,0 +1,13 @@
+alter table ic_form_query_builder add COLUMN ITEM_TYPE VARCHAR(32) NOT NULL COMMENT '组件类型' after FORM_CODE;
+alter table ic_form_query_builder add COLUMN LABEL VARCHAR(32) NOT NULL COMMENT '项标签' after FORM_ITEM_ID;
+alter table ic_form_query_builder add COLUMN FUN_TYPE VARCHAR(32) COMMENT '值转换类型' after QUERY_TYPE;
+
+update ic_form_query_builder set item_type=(
+select i.ITEM_TYPE from ic_form_item i where i.id=FORM_ITEM_ID
+and i.CUSTOMER_ID=CUSTOMER_ID
+)where DEL_FLAG='0';
+
+update ic_form_query_builder set LABEL=(
+select i.LABEL from ic_form_item i where i.id=FORM_ITEM_ID
+and i.CUSTOMER_ID=CUSTOMER_ID
+)where DEL_FLAG='0';

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml

@@ -0,0 +1,24 @@
+<?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.dao.IcExportTemplateConfigDao">
+
+    <resultMap type="com.epmet.entity.IcExportTemplateConfigEntity" id="icExportTemplateConfigMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="tempId" column="TEMP_ID"/>
+        <result property="pid" column="PID"/>
+        <result property="formItemId" column="FORM_ITEM_ID"/>
+        <result property="width" column="WIDTH"/>
+        <result property="label" column="LABEL"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <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"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.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.dao.IcExportTemplateDao">
+
+    <resultMap type="com.epmet.entity.IcExportTemplateEntity" id="icExportTemplateMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="formCode" column="FORM_CODE"/>
+        <result property="name" column="NAME"/>
+        <result property="type" column="TYPE"/>
+        <result property="url" column="URL"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <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"/>
+    </resultMap>
+
+
+</mapper>