diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index b87fa1c8..386cc430 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -1605,4 +1605,17 @@ ALTER TABLE jsh_log DROP FOREIGN KEY FKF2696AA13E226853; -- ---------------------------- ALTER TABLE jsh_material DROP FOREIGN KEY FK675951272AB6672C; ALTER TABLE jsh_material DROP FOREIGN KEY jsh_material_ibfk_1; +-- ---------------------------- +-- 时间:2019年4月24日 +-- version:1.0.14 +-- 此次更新 +-- 1、批量增加部分表的tenant_id租户字段 +-- 特别提醒:之后的sql都是在之前基础上迭代,可以对已存在的系统进行数据保留更新 +-- ---------------------------- +alter table databasechangelog add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table databasechangeloglock add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table jsh_app add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table jsh_functions add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table jsh_materialproperty add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table jsh_userbusiness add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx index 51aba82e..de87917a 100644 Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ diff --git a/src/main/java/com/jsh/erp/datasource/entities/App.java b/src/main/java/com/jsh/erp/datasource/entities/App.java index c5d30bf6..8639e7fb 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/App.java +++ b/src/main/java/com/jsh/erp/datasource/entities/App.java @@ -129,6 +129,14 @@ public class App { */ private String deleteFlag; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_app.tenant_id + * + * @mbggenerated + */ + private Long tenantId; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_app.Id @@ -512,4 +520,28 @@ public class App { public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_app.tenant_id + * + * @return the value of jsh_app.tenant_id + * + * @mbggenerated + */ + public Long getTenantId() { + return tenantId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_app.tenant_id + * + * @param tenantId the value for jsh_app.tenant_id + * + * @mbggenerated + */ + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AppExample.java b/src/main/java/com/jsh/erp/datasource/entities/AppExample.java index ed21763a..87d8bbde 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AppExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AppExample.java @@ -1263,6 +1263,66 @@ public class AppExample { addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } + + public Criteria andTenantIdIsNull() { + addCriterion("tenant_id is null"); + return (Criteria) this; + } + + public Criteria andTenantIdIsNotNull() { + addCriterion("tenant_id is not null"); + return (Criteria) this; + } + + public Criteria andTenantIdEqualTo(Long value) { + addCriterion("tenant_id =", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotEqualTo(Long value) { + addCriterion("tenant_id <>", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThan(Long value) { + addCriterion("tenant_id >", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThanOrEqualTo(Long value) { + addCriterion("tenant_id >=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThan(Long value) { + addCriterion("tenant_id <", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThanOrEqualTo(Long value) { + addCriterion("tenant_id <=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdIn(List values) { + addCriterion("tenant_id in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotIn(List values) { + addCriterion("tenant_id not in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdBetween(Long value1, Long value2) { + addCriterion("tenant_id between", value1, value2, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotBetween(Long value1, Long value2) { + addCriterion("tenant_id not between", value1, value2, "tenantId"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Functions.java b/src/main/java/com/jsh/erp/datasource/entities/Functions.java index 272e166d..1031978a 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Functions.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Functions.java @@ -89,6 +89,14 @@ public class Functions { */ private String deleteFlag; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_functions.tenant_id + * + * @mbggenerated + */ + private Long tenantId; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_functions.Id @@ -352,4 +360,28 @@ public class Functions { public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_functions.tenant_id + * + * @return the value of jsh_functions.tenant_id + * + * @mbggenerated + */ + public Long getTenantId() { + return tenantId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_functions.tenant_id + * + * @param tenantId the value for jsh_functions.tenant_id + * + * @mbggenerated + */ + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java b/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java index 099cdf54..ba6a8f28 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java @@ -933,6 +933,66 @@ public class FunctionsExample { addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } + + public Criteria andTenantIdIsNull() { + addCriterion("tenant_id is null"); + return (Criteria) this; + } + + public Criteria andTenantIdIsNotNull() { + addCriterion("tenant_id is not null"); + return (Criteria) this; + } + + public Criteria andTenantIdEqualTo(Long value) { + addCriterion("tenant_id =", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotEqualTo(Long value) { + addCriterion("tenant_id <>", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThan(Long value) { + addCriterion("tenant_id >", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThanOrEqualTo(Long value) { + addCriterion("tenant_id >=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThan(Long value) { + addCriterion("tenant_id <", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThanOrEqualTo(Long value) { + addCriterion("tenant_id <=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdIn(List values) { + addCriterion("tenant_id in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotIn(List values) { + addCriterion("tenant_id not in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdBetween(Long value1, Long value2) { + addCriterion("tenant_id between", value1, value2, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotBetween(Long value1, Long value2) { + addCriterion("tenant_id not between", value1, value2, "tenantId"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java index 4ad6a4da..bd184753 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java @@ -49,6 +49,14 @@ public class MaterialProperty { */ private String deleteFlag; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_materialproperty.tenant_id + * + * @mbggenerated + */ + private Long tenantId; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_materialproperty.id @@ -192,4 +200,28 @@ public class MaterialProperty { public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_materialproperty.tenant_id + * + * @return the value of jsh_materialproperty.tenant_id + * + * @mbggenerated + */ + public Long getTenantId() { + return tenantId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_materialproperty.tenant_id + * + * @param tenantId the value for jsh_materialproperty.tenant_id + * + * @mbggenerated + */ + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java index 64b3e60d..64413a3c 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java @@ -593,6 +593,66 @@ public class MaterialPropertyExample { addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } + + public Criteria andTenantIdIsNull() { + addCriterion("tenant_id is null"); + return (Criteria) this; + } + + public Criteria andTenantIdIsNotNull() { + addCriterion("tenant_id is not null"); + return (Criteria) this; + } + + public Criteria andTenantIdEqualTo(Long value) { + addCriterion("tenant_id =", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotEqualTo(Long value) { + addCriterion("tenant_id <>", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThan(Long value) { + addCriterion("tenant_id >", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThanOrEqualTo(Long value) { + addCriterion("tenant_id >=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThan(Long value) { + addCriterion("tenant_id <", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThanOrEqualTo(Long value) { + addCriterion("tenant_id <=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdIn(List values) { + addCriterion("tenant_id in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotIn(List values) { + addCriterion("tenant_id not in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdBetween(Long value1, Long value2) { + addCriterion("tenant_id between", value1, value2, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotBetween(Long value1, Long value2) { + addCriterion("tenant_id not between", value1, value2, "tenantId"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java b/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java index 2f6fe048..48627c14 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java @@ -49,6 +49,14 @@ public class UserBusiness { */ private String deleteFlag; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_userbusiness.tenant_id + * + * @mbggenerated + */ + private Long tenantId; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_userbusiness.Id @@ -192,4 +200,28 @@ public class UserBusiness { public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_userbusiness.tenant_id + * + * @return the value of jsh_userbusiness.tenant_id + * + * @mbggenerated + */ + public Long getTenantId() { + return tenantId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_userbusiness.tenant_id + * + * @param tenantId the value for jsh_userbusiness.tenant_id + * + * @mbggenerated + */ + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java b/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java index 615c5c70..c76e443d 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java @@ -603,6 +603,66 @@ public class UserBusinessExample { addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } + + public Criteria andTenantIdIsNull() { + addCriterion("tenant_id is null"); + return (Criteria) this; + } + + public Criteria andTenantIdIsNotNull() { + addCriterion("tenant_id is not null"); + return (Criteria) this; + } + + public Criteria andTenantIdEqualTo(Long value) { + addCriterion("tenant_id =", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotEqualTo(Long value) { + addCriterion("tenant_id <>", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThan(Long value) { + addCriterion("tenant_id >", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThanOrEqualTo(Long value) { + addCriterion("tenant_id >=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThan(Long value) { + addCriterion("tenant_id <", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThanOrEqualTo(Long value) { + addCriterion("tenant_id <=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdIn(List values) { + addCriterion("tenant_id in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotIn(List values) { + addCriterion("tenant_id not in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdBetween(Long value1, Long value2) { + addCriterion("tenant_id between", value1, value2, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotBetween(Long value1, Long value2) { + addCriterion("tenant_id not between", value1, value2, "tenantId"); + return (Criteria) this; + } } /** diff --git a/src/main/resources/mapper_xml/AppMapper.xml b/src/main/resources/mapper_xml/AppMapper.xml index f1e7bc67..52e76cea 100644 --- a/src/main/resources/mapper_xml/AppMapper.xml +++ b/src/main/resources/mapper_xml/AppMapper.xml @@ -22,6 +22,7 @@ + Id, Number, Name, Type, Icon, URL, Width, Height, ReSize, OpenMax, Flash, ZL, Sort, - Remark, Enabled, delete_Flag + Remark, Enabled, delete_Flag, tenant_id - id, nativeName, enabled, sort, anotherName, delete_Flag + id, nativeName, enabled, sort, anotherName, delete_Flag, tenant_id insert into jsh_userbusiness (Id, Type, KeyId, - Value, BtnStr, delete_Flag - ) + Value, BtnStr, delete_Flag, + tenant_id) values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{keyid,jdbcType=VARCHAR}, - #{value,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR} - ) + #{value,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}, + #{tenantId,jdbcType=BIGINT})