给用户和租户表增加delete_flag字段

2024-12-08 23:28:43 +08:00
parent bf3a7dc03b
commit 411effc0a7
9 changed files with 241 additions and 38 deletions
--- 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
@@ -21,6 +21,8 @@ public class Tenant {

    private String remark;

+    private String deleteFlag;
+
    public Long getId() {
        return id;
    }
@@ -92,4 +94,12 @@ public class Tenant {
    public void setRemark(String remark) {
        this.remark = remark == null ? null : remark.trim();
    }
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
--- 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
@@ -674,6 +674,76 @@ public class TenantExample {
            addCriterion("remark not between", value1, value2, "remark");
            return (Criteria) this;
        }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
    }

    public static class Criteria extends GeneratedCriteria {
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java
@@ -33,6 +33,8 @@ public class User {

    private Long tenantId;

+    private String deleteFlag;
+
    public Long getId() {
        return id;
    }
@@ -160,4 +162,12 @@ public class User {
    public void setTenantId(Long tenantId) {
        this.tenantId = tenantId;
    }
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java
@@ -845,62 +845,62 @@ public class UserExample {
        }

        public Criteria andStatusIsNull() {
-            addCriterion("Status is null");
+            addCriterion("status is null");
            return (Criteria) this;
        }

        public Criteria andStatusIsNotNull() {
-            addCriterion("Status is not null");
+            addCriterion("status is not null");
            return (Criteria) this;
        }

        public Criteria andStatusEqualTo(Byte value) {
-            addCriterion("Status =", value, "status");
+            addCriterion("status =", value, "status");
            return (Criteria) this;
        }

        public Criteria andStatusNotEqualTo(Byte value) {
-            addCriterion("Status <>", value, "status");
+            addCriterion("status <>", value, "status");
            return (Criteria) this;
        }

        public Criteria andStatusGreaterThan(Byte value) {
-            addCriterion("Status >", value, "status");
+            addCriterion("status >", value, "status");
            return (Criteria) this;
        }

        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("Status >=", value, "status");
+            addCriterion("status >=", value, "status");
            return (Criteria) this;
        }

        public Criteria andStatusLessThan(Byte value) {
-            addCriterion("Status <", value, "status");
+            addCriterion("status <", value, "status");
            return (Criteria) this;
        }

        public Criteria andStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("Status <=", value, "status");
+            addCriterion("status <=", value, "status");
            return (Criteria) this;
        }

        public Criteria andStatusIn(List<Byte> values) {
-            addCriterion("Status in", values, "status");
+            addCriterion("status in", values, "status");
            return (Criteria) this;
        }

        public Criteria andStatusNotIn(List<Byte> values) {
-            addCriterion("Status not in", values, "status");
+            addCriterion("status not in", values, "status");
            return (Criteria) this;
        }

        public Criteria andStatusBetween(Byte value1, Byte value2) {
-            addCriterion("Status between", value1, value2, "status");
+            addCriterion("status between", value1, value2, "status");
            return (Criteria) this;
        }

        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("Status not between", value1, value2, "status");
+            addCriterion("status not between", value1, value2, "status");
            return (Criteria) this;
        }

@@ -1173,6 +1173,76 @@ public class UserExample {
            addCriterion("tenant_id not between", value1, value2, "tenantId");
            return (Criteria) this;
        }
+
+        public Criteria andDeleteFlagIsNull() {
+            addCriterion("delete_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIsNotNull() {
+            addCriterion("delete_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagEqualTo(String value) {
+            addCriterion("delete_flag =", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotEqualTo(String value) {
+            addCriterion("delete_flag <>", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThan(String value) {
+            addCriterion("delete_flag >", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_flag >=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThan(String value) {
+            addCriterion("delete_flag <", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
+            addCriterion("delete_flag <=", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagLike(String value) {
+            addCriterion("delete_flag like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotLike(String value) {
+            addCriterion("delete_flag not like", value, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagIn(List<String> values) {
+            addCriterion("delete_flag in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotIn(List<String> values) {
+            addCriterion("delete_flag not in", values, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagBetween(String value1, String value2) {
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteFlagNotBetween(String value1, String value2) {
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
+            return (Criteria) this;
+        }
    }

    public static class Criteria extends GeneratedCriteria {
--- a/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml
@@ -11,6 +11,7 @@
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
  </resultMap>
  <sql id="Example_Where_Clause">
    <where>
@@ -72,7 +73,7 @@
  </sql>
  <sql id="Base_Column_List">
    id, tenant_id, login_name, user_num_limit, type, enabled, create_time, expire_time, 
-    remark
+    remark, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultMap="BaseResultMap">
    select
@@ -107,12 +108,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, remark
-      )
+      create_time, expire_time, remark, 
+      delete_flag)
    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}, #{remark,jdbcType=VARCHAR}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, 
+      #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Tenant">
    insert into jsh_tenant
@@ -144,6 +145,9 @@
      <if test="remark != null">
        remark,
      </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -173,6 +177,9 @@
      <if test="remark != null">
        #{remark,jdbcType=VARCHAR},
      </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
    </trim>
  </insert>
  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultType="java.lang.Long">
@@ -211,6 +218,9 @@
      <if test="record.remark != null">
        remark = #{record.remark,jdbcType=VARCHAR},
      </if>
+      <if test="record.deleteFlag != null">
+        delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
+      </if>
    </set>
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
@@ -226,7 +236,8 @@
      enabled = #{record.enabled,jdbcType=BIT},
      create_time = #{record.createTime,jdbcType=TIMESTAMP},
      expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
    </if>
@@ -258,6 +269,9 @@
      <if test="remark != null">
        remark = #{remark,jdbcType=VARCHAR},
      </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
@@ -270,7 +284,8 @@
      enabled = #{enabled,jdbcType=BIT},
      create_time = #{createTime,jdbcType=TIMESTAMP},
      expire_time = #{expireTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}
  </update>
 </mapper>
--- a/jshERP-boot/src/main/resources/mapper_xml/UserMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/UserMapper.xml
@@ -13,11 +13,12 @@
    <result column="phonenum" jdbcType="VARCHAR" property="phonenum" />
    <result column="ismanager" jdbcType="TINYINT" property="ismanager" />
    <result column="isystem" jdbcType="TINYINT" property="isystem" />
-    <result column="Status" jdbcType="TINYINT" property="status" />
+    <result column="status" jdbcType="TINYINT" property="status" />
    <result column="description" jdbcType="VARCHAR" property="description" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
    <result column="weixin_open_id" jdbcType="VARCHAR" property="weixinOpenId" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
  </resultMap>
  <sql id="Example_Where_Clause">
    <where>
@@ -79,7 +80,7 @@
  </sql>
  <sql id="Base_Column_List">
    id, username, login_name, password, leader_flag, position, department, email, phonenum, 
-    ismanager, isystem, Status, description, remark, weixin_open_id, tenant_id
+    ismanager, isystem, status, description, remark, weixin_open_id, tenant_id, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
    select
@@ -115,15 +116,15 @@
    insert into jsh_user (id, username, login_name, 
      password, leader_flag, position, 
      department, email, phonenum, 
-      ismanager, isystem, Status, 
+      ismanager, isystem, status, 
      description, remark, weixin_open_id, 
-      tenant_id)
+      tenant_id, delete_flag)
    values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
      #{password,jdbcType=VARCHAR}, #{leaderFlag,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
      #{department,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, 
      #{ismanager,jdbcType=TINYINT}, #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, 
      #{description,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{weixinOpenId,jdbcType=VARCHAR}, 
-      #{tenantId,jdbcType=BIGINT})
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
    insert into jsh_user
@@ -162,7 +163,7 @@
        isystem,
      </if>
      <if test="status != null">
-        Status,
+        status,
      </if>
      <if test="description != null">
        description,
@@ -176,6 +177,9 @@
      <if test="tenantId != null">
        tenant_id,
      </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -226,6 +230,9 @@
      <if test="tenantId != null">
        #{tenantId,jdbcType=BIGINT},
      </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
    </trim>
  </insert>
  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Long">
@@ -271,7 +278,7 @@
        isystem = #{record.isystem,jdbcType=TINYINT},
      </if>
      <if test="record.status != null">
-        Status = #{record.status,jdbcType=TINYINT},
+        status = #{record.status,jdbcType=TINYINT},
      </if>
      <if test="record.description != null">
        description = #{record.description,jdbcType=VARCHAR},
@@ -285,6 +292,9 @@
      <if test="record.tenantId != null">
        tenant_id = #{record.tenantId,jdbcType=BIGINT},
      </if>
+      <if test="record.deleteFlag != null">
+        delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
+      </if>
    </set>
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
@@ -303,11 +313,12 @@
      phonenum = #{record.phonenum,jdbcType=VARCHAR},
      ismanager = #{record.ismanager,jdbcType=TINYINT},
      isystem = #{record.isystem,jdbcType=TINYINT},
-      Status = #{record.status,jdbcType=TINYINT},
+      status = #{record.status,jdbcType=TINYINT},
      description = #{record.description,jdbcType=VARCHAR},
      remark = #{record.remark,jdbcType=VARCHAR},
      weixin_open_id = #{record.weixinOpenId,jdbcType=VARCHAR},
-      tenant_id = #{record.tenantId,jdbcType=BIGINT}
+      tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
    </if>
@@ -346,7 +357,7 @@
        isystem = #{isystem,jdbcType=TINYINT},
      </if>
      <if test="status != null">
-        Status = #{status,jdbcType=TINYINT},
+        status = #{status,jdbcType=TINYINT},
      </if>
      <if test="description != null">
        description = #{description,jdbcType=VARCHAR},
@@ -360,6 +371,9 @@
      <if test="tenantId != null">
        tenant_id = #{tenantId,jdbcType=BIGINT},
      </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
@@ -375,11 +389,12 @@
      phonenum = #{phonenum,jdbcType=VARCHAR},
      ismanager = #{ismanager,jdbcType=TINYINT},
      isystem = #{isystem,jdbcType=TINYINT},
-      Status = #{status,jdbcType=TINYINT},
+      status = #{status,jdbcType=TINYINT},
      description = #{description,jdbcType=VARCHAR},
      remark = #{remark,jdbcType=VARCHAR},
      weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}
  </update>
 </mapper>