优化租户添加模块

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();
+    }
 }

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<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> 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 {

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;
+    }
 }

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) {

jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml

@@ -10,6 +10,7 @@
     <result column="enabled" jdbcType="BIT" property="enabled" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,7 +71,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    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
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultMap="BaseResultMap">
     select
@@ -105,10 +107,12 @@
   <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Tenant">
     insert into jsh_tenant (id, tenant_id, login_name, 
       user_num_limit, type, enabled, 
-      create_time, expire_time)
+      create_time, expire_time, remark
+      )
     values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR}, 
       #{userNumLimit,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Tenant">
     insert into jsh_tenant
@@ -137,6 +141,9 @@
       <if test="expireTime != null">
         expire_time,
       </if>
+      <if test="remark != null">
+        remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -163,6 +170,9 @@
       <if test="expireTime != null">
         #{expireTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultType="java.lang.Long">
@@ -198,6 +208,9 @@
       <if test="record.expireTime != null">
         expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -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}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -241,6 +255,9 @@
       <if test="expireTime != null">
         expire_time = #{expireTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -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}
   </update>
 </mapper>