From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/resources/mapper/CompanyDeviceMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/CompanyDeviceMapper.xml b/src/main/resources/mapper/CompanyDeviceMapper.xml
index e21368f..d97caec 100644
--- a/src/main/resources/mapper/CompanyDeviceMapper.xml
+++ b/src/main/resources/mapper/CompanyDeviceMapper.xml
@@ -8,11 +8,17 @@
<id column="CD_Id" jdbcType="INTEGER" property="cdId" />
<result column="CD_Company_Id" jdbcType="VARCHAR" property="cdCompanyId" />
<result column="CD_Device_Code" jdbcType="VARCHAR" property="cdDeviceCode" />
+ <result column="CD_Type" jdbcType="INTEGER" property="cdType" />
+ <result column="CD_Type_Name" jdbcType="VARCHAR" property="cdTypeName" />
+ <result column="CD_Limits" jdbcType="VARCHAR" property="cdLimits" />
+ <result column="CD_Status" jdbcType="VARCHAR" property="cdStatus" />
+ <result column="CD_Status_Name" jdbcType="VARCHAR" property="cdStatusName" />
</resultMap>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
-->
- CD_Id, CD_Company_Id, CD_Device_Code
+ CD_Id, CD_Company_Id, CD_Device_Code, CD_Type, CD_Type_Name, CD_Limits, CD_Status,
+ CD_Status_Name
</sql>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3