From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- src/main/resources/mapper/ds2/BaseInfoMapper.xml | 53 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/main/resources/mapper/ds2/BaseInfoMapper.xml b/src/main/resources/mapper/ds2/BaseInfoMapper.xml index 5e7f8b8..d6a90be 100644 --- a/src/main/resources/mapper/ds2/BaseInfoMapper.xml +++ b/src/main/resources/mapper/ds2/BaseInfoMapper.xml @@ -1,32 +1,45 @@ <?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="cn.flightfeather.supervision.domain.ds2.mapper.BaseInfoMapper" > - <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.ds2.entity.BaseInfo" > + <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.ds2.entity.BaseInfo"> <!-- WARNING - @mbg.generated --> - <id column="BI_GUID" property="biGuid" jdbcType="VARCHAR" /> - <result column="BI_Name" property="biName" jdbcType="VARCHAR" /> - <result column="CI_GUID" property="ciGuid" jdbcType="VARCHAR" /> - <result column="CI_Name" property="ciName" jdbcType="VARCHAR" /> - <result column="BI_Management_Company_Id" property="biManagementCompanyId" jdbcType="VARCHAR" /> - <result column="BI_Management_Company" property="biManagementCompany" jdbcType="VARCHAR" /> - <result column="BI_Contact" property="biContact" jdbcType="VARCHAR" /> - <result column="BI_Telephone" property="biTelephone" jdbcType="VARCHAR" /> - <result column="BI_Address" property="biAddress" jdbcType="VARCHAR" /> - <result column="BI_Create_Time" property="biCreateTime" jdbcType="TIMESTAMP" /> - <result column="BI_Update_Time" property="biUpdateTime" jdbcType="TIMESTAMP" /> - <result column="BI_Extension1" property="biExtension1" jdbcType="VARCHAR" /> - <result column="BI_Extension2" property="biExtension2" jdbcType="VARCHAR" /> - <result column="BI_Extension3" property="biExtension3" jdbcType="VARCHAR" /> - <result column="BI_Remark" property="biRemark" jdbcType="VARCHAR" /> + <id column="BI_GUID" jdbcType="VARCHAR" property="biGuid"/> + <result column="BI_Name" jdbcType="VARCHAR" property="biName"/> + <result column="BI_Nick_Name" jdbcType="VARCHAR" property="biNickName"/> + <result column="CI_GUID" jdbcType="VARCHAR" property="ciGuid"/> + <result column="CI_Name" jdbcType="VARCHAR" property="ciName"/> + <result column="BI_Province_Code" jdbcType="VARCHAR" property="biProvinceCode"/> + <result column="BI_Province_Name" jdbcType="VARCHAR" property="biProvinceName"/> + <result column="BI_City_Code" jdbcType="VARCHAR" property="biCityCode"/> + <result column="BI_City_Name" jdbcType="VARCHAR" property="biCityName"/> + <result column="BI_District_Code" jdbcType="VARCHAR" property="biDistrictCode"/> + <result column="BI_District_Name" jdbcType="VARCHAR" property="biDistrictName"/> + <result column="BI_Town_Code" jdbcType="VARCHAR" property="biTownCode"/> + <result column="BI_Town_Name" jdbcType="VARCHAR" property="biTownName"/> + <result column="BI_Area_Code" jdbcType="VARCHAR" property="biAreaCode"/> + <result column="BI_Area" jdbcType="VARCHAR" property="biArea"/> + <result column="BI_Management_Company_Id" jdbcType="VARCHAR" property="biManagementCompanyId"/> + <result column="BI_Management_Company" jdbcType="VARCHAR" property="biManagementCompany"/> + <result column="BI_Contact" jdbcType="VARCHAR" property="biContact"/> + <result column="BI_Telephone" jdbcType="VARCHAR" property="biTelephone"/> + <result column="BI_Address" jdbcType="VARCHAR" property="biAddress"/> + <result column="BI_Create_Time" jdbcType="TIMESTAMP" property="biCreateTime"/> + <result column="BI_Update_Time" jdbcType="TIMESTAMP" property="biUpdateTime"/> + <result column="BI_Extension1" jdbcType="VARCHAR" property="biExtension1"/> + <result column="BI_Extension2" jdbcType="VARCHAR" property="biExtension2"/> + <result column="BI_Extension3" jdbcType="VARCHAR" property="biExtension3"/> + <result column="BI_Remark" jdbcType="VARCHAR" property="biRemark"/> </resultMap> - <sql id="Base_Column_List" > + <sql id="Base_Column_List"> <!-- WARNING - @mbg.generated --> - BI_GUID, BI_Name, CI_GUID, CI_Name, BI_Management_Company_Id, BI_Management_Company, - BI_Contact, BI_Telephone, BI_Address, BI_Create_Time, BI_Update_Time, BI_Extension1, - BI_Extension2, BI_Extension3, BI_Remark + BI_GUID, BI_Name, BI_Nick_Name, CI_GUID, CI_Name, BI_Province_Code, BI_Province_Name, + BI_City_Code, BI_City_Name, BI_District_Code, BI_District_Name, BI_Town_Code, BI_Town_Name, + BI_Area_Code, BI_Area, BI_Management_Company_Id, BI_Management_Company, BI_Contact, + BI_Telephone, BI_Address, BI_Create_Time, BI_Update_Time, BI_Extension1, BI_Extension2, + BI_Extension3, BI_Remark </sql> </mapper> \ No newline at end of file -- Gitblit v1.9.3