!39 添加删除标记

Merge pull request !39 from 乾坤平台/master

src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java

@@ -65,6 +65,14 @@ public class SystemConfig {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_systemconfig.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_systemconfig.id
@@ -256,4 +264,28 @@ public class SystemConfig {
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_systemconfig.delete_Flag
+     *
+     * @return the value of jsh_systemconfig.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_systemconfig.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_systemconfig.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java

@@ -733,6 +733,76 @@ public class SystemConfigExample {
             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;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/Unit.java

@@ -25,6 +25,14 @@ public class Unit {
      */
     private Long tenantId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_unit.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_unit.id
@@ -96,4 +104,28 @@ public class Unit {
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_unit.delete_Flag
+     *
+     * @return the value of jsh_unit.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_unit.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_unit.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/UnitExample.java

@@ -383,6 +383,76 @@ public class UnitExample {
             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;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java

@@ -41,6 +41,14 @@ public class UserBusiness {
      */
     private String btnstr;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_userbusiness.delete_Flag
+     *
+     * @mbggenerated
+     */
+    private String deleteFlag;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_userbusiness.Id
@@ -160,4 +168,28 @@ public class UserBusiness {
     public void setBtnstr(String btnstr) {
         this.btnstr = btnstr == null ? null : btnstr.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_userbusiness.delete_Flag
+     *
+     * @return the value of jsh_userbusiness.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_userbusiness.delete_Flag
+     *
+     * @param deleteFlag the value for jsh_userbusiness.delete_Flag
+     *
+     * @mbggenerated
+     */
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java

@@ -533,6 +533,76 @@ public class UserBusinessExample {
             addCriterion("BtnStr not between", value1, value2, "btnstr");
             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;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java

@@ -60,4 +60,6 @@ public interface SerialNumberMapperEx {
      * 批量添加序列号
      * */
     int batAddSerialNumber(@Param("list") List<SerialNumberEx> list);
+
+    int batchDeleteSerialNumberByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }

src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java

@@ -391,4 +391,23 @@ public class SerialNumberService {
             }while(batAddTotal>0);
         }
     }
+    /**
+     * create by: qiankunpingtai
+     * website：http://39.105.146.63/symphony/
+     * description:
+     *  逻辑删除序列号信息
+     * create time: 2019/3/27 17:43
+     * @Param: ids
+     * @return
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteSerialNumberByIds(String ids) {
+        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_SERIAL_NUMBER,
+                new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        User userInfo=userService.getCurrentUser();
+        String [] idArray=ids.split(",");
+        return serialNumberMapperEx.batchDeleteSerialNumberByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
+
+    }
 }

src/main/java/com/jsh/erp/service/user/UserService.java

@@ -112,7 +112,7 @@ public class UserService {
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int updateUserByObj(User user) {
-        logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER,
+        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER,
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(user.getId()).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         return userMapper.updateByPrimaryKeySelective(user);
@@ -128,7 +128,7 @@ public class UserService {
      */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int resetPwd(String md5Pwd, Long id) {
-        logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER,
+        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER,
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         User user = new User();
@@ -217,7 +217,7 @@ public class UserService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void addUserAndOrgUserRel(UserEx ue) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER,
+        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER,
                 BusinessConstants.LOG_OPERATION_TYPE_ADD,
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         //检查用户名和登录名
@@ -274,7 +274,7 @@ public class UserService {
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void updateUserAndOrgUserRel(UserEx ue) throws Exception{
-        logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER,
+        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER,
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ue.getId()).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         //检查用户名和登录名
@@ -405,7 +405,7 @@ public class UserService {
      * */
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void batDeleteUser(String ids) {
-        logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER,
+        logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER,
                 new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         String idsArray[]=ids.split(",");

src/main/resources/mapper_xml/AccountHeadMapper.xml

@@ -17,6 +17,7 @@
     <result column="BillTime" jdbcType="TIMESTAMP" property="billtime" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -90,7 +91,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     Id, Type, OrganId, HandsPersonId, ChangeAmount, TotalPrice, AccountId, BillNo, BillTime, 
-    Remark, tenant_id
+    Remark, tenant_id, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="BaseResultMap">
     <!--
@@ -146,11 +147,13 @@
     insert into jsh_accounthead (Id, Type, OrganId, 
       HandsPersonId, ChangeAmount, TotalPrice, 
       AccountId, BillNo, BillTime, 
-      Remark, tenant_id)
+      Remark, tenant_id, delete_Flag
+      )
     values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT}, 
       #{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL}, 
       #{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP}, 
-      #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
+      #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
     <!--
@@ -192,6 +195,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">
@@ -227,6 +233,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.AccountHeadExample" resultType="java.lang.Integer">
@@ -279,6 +288,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" />
@@ -300,7 +312,8 @@
       BillNo = #{record.billno,jdbcType=VARCHAR},
       BillTime = #{record.billtime,jdbcType=TIMESTAMP},
       Remark = #{record.remark,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>
@@ -342,6 +355,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>
@@ -360,7 +376,8 @@
       BillNo = #{billno,jdbcType=VARCHAR},
       BillTime = #{billtime,jdbcType=TIMESTAMP},
       Remark = #{remark,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/AccountItemMapper.xml

@@ -13,6 +13,7 @@
     <result column="EachAmount" jdbcType="DECIMAL" property="eachamount" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -85,7 +86,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark, tenant_id
+    Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark, tenant_id, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="BaseResultMap">
     <!--
@@ -140,10 +141,10 @@
     -->
     insert into jsh_accountitem (Id, HeaderId, AccountId, 
       InOutItemId, EachAmount, Remark, 
-      tenant_id)
+      tenant_id, delete_Flag)
     values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
       #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, 
-      #{tenantId,jdbcType=BIGINT})
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
     <!--
@@ -173,6 +174,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">
@@ -196,6 +200,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.AccountItemExample" resultType="java.lang.Integer">
@@ -236,6 +243,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" />
@@ -253,7 +263,8 @@
       InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
       EachAmount = #{record.eachamount,jdbcType=DECIMAL},
       Remark = #{record.remark,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>
@@ -283,6 +294,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>
@@ -297,7 +311,8 @@
       InOutItemId = #{inoutitemid,jdbcType=BIGINT},
       EachAmount = #{eachamount,jdbcType=DECIMAL},
       Remark = #{remark,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/AccountMapper.xml

@@ -14,6 +14,7 @@
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
     <result column="IsDefault" jdbcType="BIT" property="isdefault" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -86,7 +87,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id
+    Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap">
     <!--
@@ -141,10 +142,12 @@
     -->
     insert into jsh_account (Id, Name, SerialNo, 
       InitialAmount, CurrentAmount, Remark, 
-      IsDefault, tenant_id)
+      IsDefault, tenant_id, delete_Flag
+      )
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR}, 
       #{initialamount,jdbcType=DECIMAL}, #{currentamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, 
-      #{isdefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT})
+      #{isdefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
     <!--
@@ -177,6 +180,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">
@@ -203,6 +209,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.AccountExample" resultType="java.lang.Integer">
@@ -246,6 +255,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" />
@@ -264,7 +276,8 @@
       CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
       Remark = #{record.remark,jdbcType=VARCHAR},
       IsDefault = #{record.isdefault,jdbcType=BIT},
-      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>
@@ -297,6 +310,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>
@@ -312,7 +328,8 @@
       CurrentAmount = #{currentamount,jdbcType=DECIMAL},
       Remark = #{remark,jdbcType=VARCHAR},
       IsDefault = #{isdefault,jdbcType=BIT},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/AppMapper.xml

@@ -21,6 +21,7 @@
     <result column="Sort" jdbcType="VARCHAR" property="sort" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
     <result column="Enabled" jdbcType="BIT" property="enabled" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -94,7 +95,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     Id, Number, Name, Type, Icon, URL, Width, Height, ReSize, OpenMax, Flash, ZL, Sort, 
-    Remark, Enabled
+    Remark, Enabled, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AppExample" resultMap="BaseResultMap">
     <!--
@@ -150,13 +151,13 @@
     insert into jsh_app (Id, Number, Name, 
       Type, Icon, URL, Width, 
       Height, ReSize, OpenMax, Flash, 
-      ZL, Sort, Remark, Enabled
-      )
+      ZL, Sort, Remark, Enabled, 
+      delete_Flag)
     values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{width,jdbcType=VARCHAR}, 
       #{height,jdbcType=VARCHAR}, #{resize,jdbcType=BIT}, #{openmax,jdbcType=BIT}, #{flash,jdbcType=BIT}, 
-      #{zl,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}
-      )
+      #{zl,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.App">
     <!--
@@ -210,6 +211,9 @@
       <if test="enabled != null">
         Enabled,
       </if>
+      <if test="deleteFlag != null">
+        delete_Flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -257,6 +261,9 @@
       <if test="enabled != null">
         #{enabled,jdbcType=BIT},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AppExample" resultType="java.lang.Integer">
@@ -321,6 +328,9 @@
       <if test="record.enabled != null">
         Enabled = #{record.enabled,jdbcType=BIT},
       </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" />
@@ -346,7 +356,8 @@
       ZL = #{record.zl,jdbcType=VARCHAR},
       Sort = #{record.sort,jdbcType=VARCHAR},
       Remark = #{record.remark,jdbcType=VARCHAR},
-      Enabled = #{record.enabled,jdbcType=BIT}
+      Enabled = #{record.enabled,jdbcType=BIT},
+      delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -400,6 +411,9 @@
       <if test="enabled != null">
         Enabled = #{enabled,jdbcType=BIT},
       </if>
+      <if test="deleteFlag != null">
+        delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -422,7 +436,8 @@
       ZL = #{zl,jdbcType=VARCHAR},
       Sort = #{sort,jdbcType=VARCHAR},
       Remark = #{remark,jdbcType=VARCHAR},
-      Enabled = #{enabled,jdbcType=BIT}
+      Enabled = #{enabled,jdbcType=BIT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/AssetCategoryMapper.xml

@@ -11,6 +11,7 @@
     <result column="isystem" jdbcType="TINYINT" property="isystem" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -83,7 +84,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, assetname, isystem, description, tenant_id
+    id, assetname, isystem, description, tenant_id, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AssetCategoryExample" resultMap="BaseResultMap">
     <!--
@@ -137,9 +138,11 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_assetcategory (id, assetname, isystem, 
-      description, tenant_id)
+      description, tenant_id, delete_Flag
+      )
     values (#{id,jdbcType=BIGINT}, #{assetname,jdbcType=VARCHAR}, #{isystem,jdbcType=TINYINT}, 
-      #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
+      #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AssetCategory">
     <!--
@@ -163,6 +166,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">
@@ -180,6 +186,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.AssetCategoryExample" resultType="java.lang.Integer">
@@ -214,6 +223,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" />
@@ -229,7 +241,8 @@
       assetname = #{record.assetname,jdbcType=VARCHAR},
       isystem = #{record.isystem,jdbcType=TINYINT},
       description = #{record.description,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>
@@ -253,6 +266,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>
@@ -265,7 +281,8 @@
     set assetname = #{assetname,jdbcType=VARCHAR},
       isystem = #{isystem,jdbcType=TINYINT},
       description = #{description,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/AssetMapper.xml

@@ -24,6 +24,7 @@
     <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
     <result column="updator" jdbcType="BIGINT" property="updator" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.jsh.erp.datasource.entities.Asset">
     <!--
@@ -106,7 +107,7 @@
     -->
     id, assetnameID, location, labels, status, userID, price, purchasedate, periodofvalidity, 
     warrantydate, assetnum, serialnum, supplier, createtime, creator, updatetime, updator, 
-    tenant_id
+    tenant_id, delete_Flag
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -194,14 +195,16 @@
       warrantydate, assetnum, serialnum, 
       supplier, createtime, creator, 
       updatetime, updator, tenant_id, 
-      description, addMonth)
+      delete_Flag, description, addMonth
+      )
     values (#{id,jdbcType=BIGINT}, #{assetnameid,jdbcType=BIGINT}, #{location,jdbcType=VARCHAR}, 
       #{labels,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, #{userid,jdbcType=BIGINT}, 
       #{price,jdbcType=DECIMAL}, #{purchasedate,jdbcType=TIMESTAMP}, #{periodofvalidity,jdbcType=TIMESTAMP}, 
       #{warrantydate,jdbcType=TIMESTAMP}, #{assetnum,jdbcType=VARCHAR}, #{serialnum,jdbcType=VARCHAR}, 
       #{supplier,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, 
-      #{description,jdbcType=LONGVARCHAR}, #{addmonth,jdbcType=LONGVARCHAR})
+      #{deleteFlag,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, #{addmonth,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Asset">
     <!--
@@ -264,6 +267,9 @@
       <if test="tenantId != null">
         tenant_id,
       </if>
+      <if test="deleteFlag != null">
+        delete_Flag,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -326,6 +332,9 @@
       <if test="tenantId != null">
         #{tenantId,jdbcType=BIGINT},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -405,6 +414,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>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -440,6 +452,7 @@
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       updator = #{record.updator,jdbcType=BIGINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR},
       addMonth = #{record.addmonth,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -469,7 +482,8 @@
       creator = #{record.creator,jdbcType=BIGINT},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       updator = #{record.updator,jdbcType=BIGINT},
-      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>
@@ -532,6 +546,9 @@
       <if test="tenantId != null">
         tenant_id = #{tenantId,jdbcType=BIGINT},
       </if>
+      <if test="deleteFlag != null">
+        delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -564,6 +581,7 @@
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       updator = #{updator,jdbcType=BIGINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
       description = #{description,jdbcType=LONGVARCHAR},
       addMonth = #{addmonth,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
@@ -590,7 +608,8 @@
       creator = #{creator,jdbcType=BIGINT},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       updator = #{updator,jdbcType=BIGINT},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/AssetNameMapper.xml

@@ -12,6 +12,7 @@
     <result column="isystem" jdbcType="SMALLINT" property="isystem" />
     <result column="isconsumables" jdbcType="SMALLINT" property="isconsumables" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.jsh.erp.datasource.entities.AssetName">
     <!--
@@ -91,7 +92,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, assetname, assetcategoryID, isystem, isconsumables, tenant_id
+    id, assetname, assetcategoryID, isystem, isconsumables, tenant_id, delete_Flag
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -175,10 +176,10 @@
     -->
     insert into jsh_assetname (id, assetname, assetcategoryID, 
       isystem, isconsumables, tenant_id, 
-      description)
+      delete_Flag, description)
     values (#{id,jdbcType=BIGINT}, #{assetname,jdbcType=VARCHAR}, #{assetcategoryid,jdbcType=BIGINT}, 
       #{isystem,jdbcType=SMALLINT}, #{isconsumables,jdbcType=SMALLINT}, #{tenantId,jdbcType=BIGINT}, 
-      #{description,jdbcType=LONGVARCHAR})
+      #{deleteFlag,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AssetName">
     <!--
@@ -205,6 +206,9 @@
       <if test="tenantId != null">
         tenant_id,
       </if>
+      <if test="deleteFlag != null">
+        delete_Flag,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -228,6 +232,9 @@
       <if test="tenantId != null">
         #{tenantId,jdbcType=BIGINT},
       </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -268,6 +275,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>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -288,6 +298,7 @@
       isystem = #{record.isystem,jdbcType=SMALLINT},
       isconsumables = #{record.isconsumables,jdbcType=SMALLINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -304,7 +315,8 @@
       assetcategoryID = #{record.assetcategoryid,jdbcType=BIGINT},
       isystem = #{record.isystem,jdbcType=SMALLINT},
       isconsumables = #{record.isconsumables,jdbcType=SMALLINT},
-      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>
@@ -331,6 +343,9 @@
       <if test="tenantId != null">
         tenant_id = #{tenantId,jdbcType=BIGINT},
       </if>
+      <if test="deleteFlag != null">
+        delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -348,6 +363,7 @@
       isystem = #{isystem,jdbcType=SMALLINT},
       isconsumables = #{isconsumables,jdbcType=SMALLINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -361,7 +377,8 @@
       assetcategoryID = #{assetcategoryid,jdbcType=BIGINT},
       isystem = #{isystem,jdbcType=SMALLINT},
       isconsumables = #{isconsumables,jdbcType=SMALLINT},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -36,6 +36,7 @@
     <result column="Status" jdbcType="VARCHAR" property="status" />
     <result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -112,7 +113,7 @@
     OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, 
     PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, 
     DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status, 
-    LinkNumber, tenant_id
+    LinkNumber, tenant_id, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
     <!--
@@ -174,8 +175,8 @@
       AccountIdList, AccountMoneyList, Discount, 
       DiscountMoney, DiscountLastMoney, OtherMoney, 
       OtherMoneyList, OtherMoneyItem, AccountDay, 
-      Status, LinkNumber, tenant_id
-      )
+      Status, LinkNumber, tenant_id, 
+      delete_Flag)
     values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, 
       #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
       #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, 
@@ -185,8 +186,8 @@
       #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
       #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, 
       #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, 
-      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
-      )
+      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
     <!--
@@ -285,6 +286,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">
@@ -377,6 +381,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.DepotHeadExample" resultType="java.lang.Integer">
@@ -486,6 +493,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" />
@@ -526,7 +536,8 @@
       AccountDay = #{record.accountday,jdbcType=INTEGER},
       Status = #{record.status,jdbcType=VARCHAR},
       LinkNumber = #{record.linknumber,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>
@@ -625,6 +636,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>
@@ -662,7 +676,8 @@
       AccountDay = #{accountday,jdbcType=INTEGER},
       Status = #{status,jdbcType=VARCHAR},
       LinkNumber = #{linknumber,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/DepotItemMapper.xml

@@ -30,6 +30,7 @@
     <result column="OtherField5" jdbcType="VARCHAR" property="otherfield5" />
     <result column="MType" jdbcType="VARCHAR" property="mtype" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -104,7 +105,8 @@
     -->
     Id, HeaderId, MaterialId, MUnit, OperNumber, BasicNumber, UnitPrice, TaxUnitPrice, 
     AllPrice, Remark, Img, Incidentals, DepotId, AnotherDepotId, TaxRate, TaxMoney, TaxLastMoney, 
-    OtherField1, OtherField2, OtherField3, OtherField4, OtherField5, MType, tenant_id
+    OtherField1, OtherField2, OtherField3, OtherField4, OtherField5, MType, tenant_id, 
+    delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="BaseResultMap">
     <!--
@@ -164,8 +166,8 @@
       DepotId, AnotherDepotId, TaxRate, 
       TaxMoney, TaxLastMoney, OtherField1, 
       OtherField2, OtherField3, OtherField4, 
-      OtherField5, MType, tenant_id
-      )
+      OtherField5, MType, tenant_id, 
+      delete_Flag)
     values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT}, 
       #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL}, #{basicnumber,jdbcType=DECIMAL}, 
       #{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL}, #{allprice,jdbcType=DECIMAL}, 
@@ -173,8 +175,8 @@
       #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DECIMAL}, 
       #{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL}, #{otherfield1,jdbcType=VARCHAR}, 
       #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{otherfield4,jdbcType=VARCHAR}, 
-      #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
-      )
+      #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
     <!--
@@ -255,6 +257,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">
@@ -329,6 +334,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.DepotItemExample" resultType="java.lang.Integer">
@@ -420,6 +428,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" />
@@ -454,7 +465,8 @@
       OtherField4 = #{record.otherfield4,jdbcType=VARCHAR},
       OtherField5 = #{record.otherfield5,jdbcType=VARCHAR},
       MType = #{record.mtype,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>
@@ -535,6 +547,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>
@@ -566,7 +581,8 @@
       OtherField4 = #{otherfield4,jdbcType=VARCHAR},
       OtherField5 = #{otherfield5,jdbcType=VARCHAR},
       MType = #{mtype,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/DepotMapper.xml

@@ -16,6 +16,7 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="principal" jdbcType="BIGINT" property="principal" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -88,7 +89,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id
+    id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id, 
+    delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap">
     <!--
@@ -144,11 +146,11 @@
     insert into jsh_depot (id, name, address, 
       warehousing, truckage, type, 
       sort, remark, principal, 
-      tenant_id)
+      tenant_id, delete_Flag)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
       #{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, 
       #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT}, 
-      #{tenantId,jdbcType=BIGINT})
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
     <!--
@@ -187,6 +189,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">
@@ -219,6 +224,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.DepotExample" resultType="java.lang.Integer">
@@ -268,6 +276,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" />
@@ -288,7 +299,8 @@
       sort = #{record.sort,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
       principal = #{record.principal,jdbcType=BIGINT},
-      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>
@@ -327,6 +339,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>
@@ -344,7 +359,8 @@
       sort = #{sort,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       principal = #{principal,jdbcType=BIGINT},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

src/main/resources/mapper_xml/DepotMapperEx.xml

@@ -41,7 +41,7 @@
     <select id="getDepotList" parameterType="java.util.Map" resultMap="ResultMapEx">
         select dep.*,usr.username as principalName
         FROM jsh_depot dep
-        left join jsh_user usr on usr.id=dep.principal
+        left join jsh_user usr on usr.id=dep.principal and ifnull(usr.status,'0') not in('1','2')
         where 1=1
         <if test="name != null and name != ''">
             <bind name="name" value="'%' + _parameter.name + '%'" />