From 6826e12540fae82ad9c6dcee6f78e0207aebc35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 13 Oct 2021 00:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=9F=E6=88=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/datasource/entities/Tenant.java | 10 +++ .../datasource/entities/TenantExample.java | 70 +++++++++++++++++++ .../jsh/erp/datasource/entities/UserEx.java | 22 ++++++ .../com/jsh/erp/service/user/UserService.java | 3 + .../resources/mapper_xml/TenantMapper.xml | 28 ++++++-- 5 files changed, 128 insertions(+), 5 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java index 7e4457c5..1b6b1043 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java @@ -19,6 +19,8 @@ public class Tenant { private Date expireTime; + private String remark; + public Long getId() { return id; } @@ -82,4 +84,12 @@ public class Tenant { public void setExpireTime(Date expireTime) { this.expireTime = expireTime; } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java index 51b76156..063899d3 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java @@ -604,6 +604,76 @@ public class TenantExample { addCriterion("expire_time not between", value1, value2, "expireTime"); return (Criteria) this; } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java index 79987311..ecc2f3c9 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java @@ -1,5 +1,7 @@ package com.jsh.erp.datasource.entities; +import java.util.Date; + /** * Description * @@ -22,6 +24,10 @@ public class UserEx extends User{ private String userType; + private Integer userNumLimit; + + private String expireTime; + public String getOrgAbr() { return orgAbr; } @@ -77,4 +83,20 @@ public class UserEx extends User{ public void setUserType(String userType) { this.userType = userType; } + + public Integer getUserNumLimit() { + return userNumLimit; + } + + public void setUserNumLimit(Integer userNumLimit) { + this.userNumLimit = userNumLimit; + } + + public String getExpireTime() { + return expireTime; + } + + public void setExpireTime(String expireTime) { + this.expireTime = expireTime; + } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index ba5689d7..bf4ef360 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -527,6 +527,9 @@ public class UserService { JSONObject tenantObj = new JSONObject(); tenantObj.put("tenantId", ue.getId()); tenantObj.put("loginName",ue.getLoginName()); + tenantObj.put("userNumLimit", ue.getUserNumLimit()); + tenantObj.put("expireTime", ue.getExpireTime()); + tenantObj.put("remark", ue.getRemark()); tenantService.insertTenant(tenantObj, request); logger.info("===============创建租户信息完成==============="); if (result > 0) { diff --git a/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml index e1a72da9..a0a0ba07 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml @@ -10,6 +10,7 @@ + @@ -70,7 +71,8 @@ - id, tenant_id, login_name, user_num_limit, type, enabled, create_time, expire_time + id, tenant_id, login_name, user_num_limit, type, enabled, create_time, expire_time, + remark @@ -198,6 +208,9 @@ expire_time = #{record.expireTime,jdbcType=TIMESTAMP}, + + remark = #{record.remark,jdbcType=VARCHAR}, + @@ -212,7 +225,8 @@ type = #{record.type,jdbcType=VARCHAR}, enabled = #{record.enabled,jdbcType=BIT}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, - expire_time = #{record.expireTime,jdbcType=TIMESTAMP} + expire_time = #{record.expireTime,jdbcType=TIMESTAMP}, + remark = #{record.remark,jdbcType=VARCHAR} @@ -241,6 +255,9 @@ expire_time = #{expireTime,jdbcType=TIMESTAMP}, + + remark = #{remark,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -252,7 +269,8 @@ type = #{type,jdbcType=VARCHAR}, enabled = #{enabled,jdbcType=BIT}, create_time = #{createTime,jdbcType=TIMESTAMP}, - expire_time = #{expireTime,jdbcType=TIMESTAMP} + expire_time = #{expireTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file