From e9472ccef92a65f84bb1b95c13697d083afdb3b4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 25 Nov 2022 15:04:00 +0800 Subject: [PATCH] ic_resi_rent_contract_info --- ...ContractInfoDao.java => IcResiRentContractInfoDao.java} | 4 ++-- ...ctInfoEntity.java => IcResiRentContractInfoEntity.java} | 7 ++----- .../src/main/java/com/epmet/enums/IcResiUserTableEnum.java | 3 ++- .../db/migration/V0.0.93__ic_resi_contract_info.sql | 2 +- ...siContractInfoDao.xml => IcResiRentContractInfoDao.xml} | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) rename epmet-user/epmet-user-server/src/main/java/com/epmet/dao/{IcResiContractInfoDao.java => IcResiRentContractInfoDao.java} (61%) rename epmet-user/epmet-user-server/src/main/java/com/epmet/entity/{IcResiContractInfoEntity.java => IcResiRentContractInfoEntity.java} (84%) rename epmet-user/epmet-user-server/src/main/resources/mapper/{IcResiContractInfoDao.xml => IcResiRentContractInfoDao.xml} (83%) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiContractInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java similarity index 61% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiContractInfoDao.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java index d3ba7a1a5f..0c04b9a1fb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiContractInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java @@ -1,7 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.IcResiContractInfoEntity; +import com.epmet.entity.IcResiRentContractInfoEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-11-25 */ @Mapper -public interface IcResiContractInfoDao extends BaseDao { +public interface IcResiRentContractInfoDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiContractInfoEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiRentContractInfoEntity.java similarity index 84% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiContractInfoEntity.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiRentContractInfoEntity.java index 23ba9b4086..fa0b52fd48 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiContractInfoEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiRentContractInfoEntity.java @@ -1,13 +1,10 @@ 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; - /** * 居民租房信息 * @@ -16,8 +13,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("ic_resi_contract_info") -public class IcResiContractInfoEntity extends BaseEpmetEntity { +@TableName("ic_resi_rent_contract_info") +public class IcResiRentContractInfoEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java index c921136c00..bfd81f56b0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java @@ -22,6 +22,8 @@ public enum IcResiUserTableEnum { IC_VOLUNTEER("ic_volunteer","志愿者信息录入表", 6, 3, "IS_VOLUNTEER", true), IC_OLD_PEOPLE("ic_old_people","老年人信息录入表", 7, 2, "IS_OLD_PEOPLE", true), IC_SPECIAL("ic_special","特殊人群信息录入表", 8, 3, "IS_SPECIAL", true), + IC_TENANT("ic_resi_rent_contract_info","租户信息录入表", null, 2, "IS_TENANT", true), + // 下面的是：没有实际数据库表，在ic_resi_user中有一个标记，但是导入的时候是有单独的sheet的 IC_DBH("virtual_dbh","低保人员信息录入表", null, 2, "IS_DBH", false), @@ -34,7 +36,6 @@ public enum IcResiUserTableEnum { IC_CJ("virtual_cj","残疾人员信息录入表", null, 2, "IS_CJ", false), IC_DB("virtual_db","大病人员信息录入表", null, 2, "IS_DB", false), IC_MB("virtual_mb","慢病人员信息录入表", null, 2, "IS_MB", false), - IC_TENANT("virtual_tenant","租户信息录入表", null, 2, "IS_TENANT", false), IC_FLOATING("virtual_floating","流动人口信息录入表", null, 2, "IS_FLOATING", false), IC_XJC("virtual_xjc","新阶层人士信息录入表", null, 2, "IS_XJC", false); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.93__ic_resi_contract_info.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.93__ic_resi_contract_info.sql index a021fc908c..b60abb22d1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.93__ic_resi_contract_info.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.93__ic_resi_contract_info.sql @@ -1,4 +1,4 @@ -CREATE TABLE `ic_resi_contract_info` ( +CREATE TABLE `ic_resi_rent_contract_info` ( `ID` varchar(64) NOT NULL COMMENT '唯一标识', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', `IC_RESI_USER` varchar(64) NOT NULL COMMENT '主表Id', diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiContractInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml similarity index 83% rename from epmet-user/epmet-user-server/src/main/resources/mapper/IcResiContractInfoDao.xml rename to epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml index 4c3335c445..25a47a8573 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiContractInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiRentContractInfoDao.xml @@ -1,9 +1,9 @@ - + - +