purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
季圣华
2023-02-20 00:14:34 +08:00
parent 5df9d972ce
commit 8b6afb1759
9 changed files with 224 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
View File

@@ -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}