给系统参数表增加多级审核开关字段，给用户表增加是否经理字段，默认为否

2023-02-20 00:14:34 +08:00
parent 5df9d972ce
commit 8b6afb1759
9 changed files with 224 additions and 19 deletions
--- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
@@ -14,6 +14,7 @@
    <result column="customer_flag" jdbcType="VARCHAR" property="customerFlag" />
    <result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
    <result column="purchase_by_sale_flag" jdbcType="VARCHAR" property="purchaseBySaleFlag" />
+    <result column="multi_level_approval_flag" jdbcType="VARCHAR" property="multiLevelApprovalFlag" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
  </resultMap>
@@ -78,7 +79,7 @@
  <sql id="Base_Column_List">
    id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, 
    sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, 
-    tenant_id, delete_flag
+    multi_level_approval_flag, tenant_id, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
    select
@@ -115,12 +116,14 @@
      company_address, company_tel, company_fax, 
      company_post_code, sale_agreement, depot_flag, 
      customer_flag, minus_stock_flag, purchase_by_sale_flag, 
-      tenant_id, delete_flag)
+      multi_level_approval_flag, tenant_id, delete_flag
+      )
    values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, 
      #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, 
      #{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR}, 
      #{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{purchaseBySaleFlag,jdbcType=VARCHAR}, 
-      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
+      #{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
    insert into jsh_system_config
@@ -161,6 +164,9 @@
      <if test="purchaseBySaleFlag != null">
        purchase_by_sale_flag,
      </if>
+      <if test="multiLevelApprovalFlag != null">
+        multi_level_approval_flag,
+      </if>
      <if test="tenantId != null">
        tenant_id,
      </if>
@@ -205,6 +211,9 @@
      <if test="purchaseBySaleFlag != null">
        #{purchaseBySaleFlag,jdbcType=VARCHAR},
      </if>
+      <if test="multiLevelApprovalFlag != null">
+        #{multiLevelApprovalFlag,jdbcType=VARCHAR},
+      </if>
      <if test="tenantId != null">
        #{tenantId,jdbcType=BIGINT},
      </if>
@@ -258,6 +267,9 @@
      <if test="record.purchaseBySaleFlag != null">
        purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
      </if>
+      <if test="record.multiLevelApprovalFlag != null">
+        multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
+      </if>
      <if test="record.tenantId != null">
        tenant_id = #{record.tenantId,jdbcType=BIGINT},
      </if>
@@ -283,6 +295,7 @@
      customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
      minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
      purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
+      multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
    <if test="_parameter != null">
@@ -325,6 +338,9 @@
      <if test="purchaseBySaleFlag != null">
        purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
      </if>
+      <if test="multiLevelApprovalFlag != null">
+        multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
+      </if>
      <if test="tenantId != null">
        tenant_id = #{tenantId,jdbcType=BIGINT},
      </if>
@@ -347,6 +363,7 @@
      customer_flag = #{customerFlag,jdbcType=VARCHAR},
      minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
      purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
+      multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
      tenant_id = #{tenantId,jdbcType=BIGINT},
      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}
--- a/jshERP-boot/src/main/resources/mapper_xml/UserMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/UserMapper.xml
@@ -6,6 +6,7 @@
    <result column="username" jdbcType="VARCHAR" property="username" />
    <result column="login_name" jdbcType="VARCHAR" property="loginName" />
    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="leader_flag" jdbcType="VARCHAR" property="leaderFlag" />
    <result column="position" jdbcType="VARCHAR" property="position" />
    <result column="department" jdbcType="VARCHAR" property="department" />
    <result column="email" jdbcType="VARCHAR" property="email" />
@@ -76,8 +77,8 @@
    </where>
  </sql>
  <sql id="Base_Column_List">
-    id, username, login_name, password, position, department, email, phonenum, ismanager, 
-    isystem, Status, description, remark, tenant_id
+    id, username, login_name, password, leader_flag, position, department, email, phonenum, 
+    ismanager, isystem, Status, description, remark, tenant_id
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
    select
@@ -111,15 +112,17 @@
  </delete>
  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.User">
    insert into jsh_user (id, username, login_name, 
-      password, position, department, 
-      email, phonenum, ismanager, 
-      isystem, Status, description, 
-      remark, tenant_id)
+      password, leader_flag, position, 
+      department, email, phonenum, 
+      ismanager, isystem, Status, 
+      description, remark, tenant_id
+      )
    values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
-      #{password,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}, #{tenantId,jdbcType=BIGINT})
+      #{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}, #{tenantId,jdbcType=BIGINT}
+      )
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
    insert into jsh_user
@@ -136,6 +139,9 @@
      <if test="password != null">
        password,
      </if>
+      <if test="leaderFlag != null">
+        leader_flag,
+      </if>
      <if test="position != null">
        position,
      </if>
@@ -180,6 +186,9 @@
      <if test="password != null">
        #{password,jdbcType=VARCHAR},
      </if>
+      <if test="leaderFlag != null">
+        #{leaderFlag,jdbcType=VARCHAR},
+      </if>
      <if test="position != null">
        #{position,jdbcType=VARCHAR},
      </if>
@@ -233,6 +242,9 @@
      <if test="record.password != null">
        password = #{record.password,jdbcType=VARCHAR},
      </if>
+      <if test="record.leaderFlag != null">
+        leader_flag = #{record.leaderFlag,jdbcType=VARCHAR},
+      </if>
      <if test="record.position != null">
        position = #{record.position,jdbcType=VARCHAR},
      </if>
@@ -274,6 +286,7 @@
      username = #{record.username,jdbcType=VARCHAR},
      login_name = #{record.loginName,jdbcType=VARCHAR},
      password = #{record.password,jdbcType=VARCHAR},
+      leader_flag = #{record.leaderFlag,jdbcType=VARCHAR},
      position = #{record.position,jdbcType=VARCHAR},
      department = #{record.department,jdbcType=VARCHAR},
      email = #{record.email,jdbcType=VARCHAR},
@@ -300,6 +313,9 @@
      <if test="password != null">
        password = #{password,jdbcType=VARCHAR},
      </if>
+      <if test="leaderFlag != null">
+        leader_flag = #{leaderFlag,jdbcType=VARCHAR},
+      </if>
      <if test="position != null">
        position = #{position,jdbcType=VARCHAR},
      </if>
@@ -338,6 +354,7 @@
    set username = #{username,jdbcType=VARCHAR},
      login_name = #{loginName,jdbcType=VARCHAR},
      password = #{password,jdbcType=VARCHAR},
+      leader_flag = #{leaderFlag,jdbcType=VARCHAR},
      position = #{position,jdbcType=VARCHAR},
      department = #{department,jdbcType=VARCHAR},
      email = #{email,jdbcType=VARCHAR},