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

给计量单位表修改比例的字段类型，给系统参数表增加金额审核启用标记，给单据增加来源字段

Browse Source
This commit is contained in:
季圣华
2023-03-09 00:01:50 +08:00
parent 00cabc2612
commit 61d9d8704f
28 changed files with 608 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapper.xml
View File

@@ -16,6 +16,7 @@
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="file_name" jdbcType="VARCHAR" property="fileName" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
@@ -79,7 +80,7 @@
</sql>
<sql id="Base_Column_List">
id, type, organ_id, hands_person_id, creator, change_amount, discount_money, total_price,
account_id, bill_no, bill_time, remark, file_name, status, tenant_id, delete_flag
account_id, bill_no, bill_time, remark, file_name, status, source, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="BaseResultMap">
select
@@ -116,14 +117,14 @@
hands_person_id, creator, change_amount,
discount_money, total_price, account_id,
bill_no, bill_time, remark,
file_name, status, tenant_id,
delete_flag)
file_name, status, source,
tenant_id, delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organId,jdbcType=BIGINT},
#{handsPersonId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL},
#{discountMoney,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL}, #{accountId,jdbcType=BIGINT},
#{billNo,jdbcType=VARCHAR}, #{billTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
#{fileName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
#{fileName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
insert into jsh_account_head
@@ -170,6 +171,9 @@
<if test="status != null">
status,
</if>
<if test="source != null">
source,
</if>
<if test="tenantId != null">
tenant_id,
</if>
@@ -220,6 +224,9 @@
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
@@ -279,6 +286,9 @@
<if test="record.status != null">
status = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.source != null">
source = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
@@ -306,6 +316,7 @@
remark = #{record.remark,jdbcType=VARCHAR},
file_name = #{record.fileName,jdbcType=VARCHAR},
status = #{record.status,jdbcType=VARCHAR},
source = #{record.source,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
@@ -354,6 +365,9 @@
<if test="status != null">
status = #{status,jdbcType=VARCHAR},
</if>
<if test="source != null">
source = #{source,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
@@ -378,6 +392,7 @@
remark = #{remark,jdbcType=VARCHAR},
file_name = #{fileName,jdbcType=VARCHAR},
status = #{status,jdbcType=VARCHAR},
source = #{source,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}