From 020617b55797f8022a4fc974518610c3c5c19c08 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 16:58:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2delflag=3D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/rent/RentContractInfoDao.xml | 135 +++++++++--------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml index 753bf93..c18cb38 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml @@ -41,72 +41,73 @@ FROM pli_rent_contract_info i LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD - - - AND i.GRID_ID = #{gridId} - - - AND i.VILLAGE_ID = #{villageId} - - - AND i.BUILD_ID = #{buildId} - - - AND i.UNIT_ID = #{unitId} - - - AND i.HOME_ID = #{homeId} - - - AND i.STATE = #{state} - - - AND i.LESSOR_NAME = #{lessorName} - - - AND i.LESSOR_ID_CARD = #{lessorIdCard} - - - AND i.LESSOR_MOBILE = #{lessorMobile} - - - AND i.LESSEE_NAME = #{lesseeName} - - - AND i.LESSEE_ID_CARD = #{lesseeIdCard} - - - AND i.LESSEE_MOBILE = #{lesseeMobile} - - - AND i.REVIEW_DATE >= #{reviewStartTime} - - - AND i.REVIEW_DATE <= #{reviewEndTime} - - - AND i.SIGN_DATE >= #{startTime} - - - AND i.SIGN_DATE <= #{endTime} - - - - AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 1 MONTH ) - AND DATE( i.END_DATE ) > CURDATE() - - - AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 2 MONTH ) - AND DATE( i.END_DATE ) > CURDATE() - - - AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 3 MONTH ) - AND DATE( i.END_DATE ) > CURDATE() - - - AND DATE( i.END_DATE ) <= CURDATE() - - - + WHERE + i.DEL_FLAG = '0' + AND b.DEL_FLAG = '0' + + AND i.GRID_ID = #{gridId} + + + AND i.VILLAGE_ID = #{villageId} + + + AND i.BUILD_ID = #{buildId} + + + AND i.UNIT_ID = #{unitId} + + + AND i.HOME_ID = #{homeId} + + + AND i.STATE = #{state} + + + AND i.LESSOR_NAME = #{lessorName} + + + AND i.LESSOR_ID_CARD = #{lessorIdCard} + + + AND i.LESSOR_MOBILE = #{lessorMobile} + + + AND i.LESSEE_NAME = #{lesseeName} + + + AND i.LESSEE_ID_CARD = #{lesseeIdCard} + + + AND i.LESSEE_MOBILE = #{lesseeMobile} + + + AND i.REVIEW_DATE >= #{reviewStartTime} + + + AND i.REVIEW_DATE <= #{reviewEndTime} + + + AND i.SIGN_DATE >= #{startTime} + + + AND i.SIGN_DATE <= #{endTime} + + + + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 1 MONTH ) + AND DATE( i.END_DATE ) > CURDATE() + + + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 2 MONTH ) + AND DATE( i.END_DATE ) > CURDATE() + + + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 3 MONTH ) + AND DATE( i.END_DATE ) > CURDATE() + + + AND DATE( i.END_DATE ) <= CURDATE() + + \ No newline at end of file From b05acf87923fd73087011f1babf8c9e4a58442ad Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 17:01:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug,=E5=85=B3=E8=81=94=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E8=A6=81=E5=9C=A8=E5=85=B3=E8=81=94=E6=97=B6=E5=8A=A0?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/rent/RentContractInfoDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml index c18cb38..820b9bb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml @@ -40,10 +40,9 @@ ( b.id IS NULL, '否', '是' ) AS isBlack FROM pli_rent_contract_info i - LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD + LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD AND b.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' - AND b.DEL_FLAG = '0' AND i.GRID_ID = #{gridId} From 978d137284f07c0b6f8f59943c1df529aef9099b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 19:21:37 +0800 Subject: [PATCH 3/3] flyway --- .../resources/db/migration/V0.0.2__rent.sql | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.2__rent.sql diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.2__rent.sql b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.2__rent.sql new file mode 100644 index 0000000..4831223 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.2__rent.sql @@ -0,0 +1,132 @@ +/* + Navicat Premium Data Transfer + + Source Server : epmet_test + Source Server Type : MySQL + Source Server Version : 50732 + Source Host : rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306 + Source Schema : epmet_pli_power + + Target Server Type : MySQL + Target Server Version : 50732 + File Encoding : 65001 + + Date: 28/04/2022 18:52:45 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for pli_rent_tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS `pli_rent_tenant_info`; +CREATE TABLE `pli_rent_tenant_info` ( + `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `CONTRACT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合同ID', + `NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '姓名', + `ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '身份证', + `MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号', + `YFZGX` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '与房主关系', + `TYPE` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '人员类型 0：房东 1：租客', + `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', + PRIMARY KEY (`ID`) USING BTREE, + INDEX `idx_cid`(`CONTRACT_ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '租客表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for pli_rent_contract_info +-- ---------------------------- +DROP TABLE IF EXISTS `pli_rent_contract_info`; +CREATE TABLE `pli_rent_contract_info` ( + `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `COMMUNITY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '社区ID', + `COMMUNITY_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '社区', + `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格ID', + `GRID_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格', + `VILLAGE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋小区ID', + `VILLAGE_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋小区', + `BUILD_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '楼号ID', + `BUILD_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '楼号', + `UNIT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单元ID', + `UNIT_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单元', + `HOME_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋ID', + `HOME_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房屋', + `OWNER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '房主姓名', + `STATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态：0未审核，1审核通过，2审核不通过', + `LESSOR_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出租人姓名', + `LESSOR_ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出租人身份证', + `LESSOR_MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出租人手机', + `LESSEE_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '承租人姓名', + `LESSEE_ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '承租人身份证', + `LESSEE_MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '承租人手机', + `SIGN_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签署日期', + `REVIEW_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核日期', + `START_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合同开始日期', + `END_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合同结束日期', + `REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核-原因', + `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', + PRIMARY KEY (`ID`) USING BTREE, + INDEX `epdc_master_topic_USER_ID_IDX`(`HOME_NAME`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '合同表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for pli_rent_contract_file +-- ---------------------------- +DROP TABLE IF EXISTS `pli_rent_contract_file`; +CREATE TABLE `pli_rent_contract_file` ( + `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', + `REFERENCE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '引用ID', + `FILE_URL` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文件地址', + `FILE_TYPE` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件类型 0：图片，1 文件（合同）', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识 0：未删除，1：删除', + `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', + PRIMARY KEY (`ID`) USING BTREE, + INDEX `idx_rid`(`REFERENCE_ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '附件表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for pli_rent_blacklist +-- ---------------------------- +DROP TABLE IF EXISTS `pli_rent_blacklist`; +CREATE TABLE `pli_rent_blacklist` ( + `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'epmet用户主键', + `NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '姓名', + `ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '身份证', + `MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号', + `GENDER` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别 0女 1男', + `TYPE` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型 0 租客 1 房东', + `JOIN_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加入时间', + `JOIN_REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加入原因', + `REMOVE_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '移除时间', + `REMOVE_REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '移除原因', + `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NULL DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', + PRIMARY KEY (`ID`) USING BTREE, + INDEX `epdc_master_topic_USER_ID_IDX`(`USER_ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '黑名单表' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1;