bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2024-09-23 16:35:39 +08:00
parent 88f1e9f954 322ae3d804
commit 4b1645e96e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml
View File

@ -144,7 +144,7 @@
<if test="backPerson != null and backPerson != ''"> <if test="backPerson != null and backPerson != ''">
back_person, back_person,
</if> </if>
<if test="backTime != null and backTime != ''"> <if test="backTime != null">
back_time, back_time,
</if> </if>
<if test="phone != null and phone != ''"> <if test="phone != null and phone != ''">
@ -153,7 +153,7 @@
<if test="directAuditBy != null"> <if test="directAuditBy != null">
direct_audit_by, direct_audit_by,
</if> </if>
<if test="directAuditTime != null and directAuditTime != ''"> <if test="directAuditTime != null">
direct_audit_time, direct_audit_time,
</if> </if>
<if test="directAuditRemark != null"> <if test="directAuditRemark != null">
@ -185,7 +185,7 @@
<if test="backPerson != null and backPerson != ''"> <if test="backPerson != null and backPerson != ''">
#{backPerson}, #{backPerson},
</if> </if>
<if test="backTime != null and backTime != ''"> <if test="backTime != null">
#{backTime}, #{backTime},
</if> </if>
<if test="phone != null and phone != ''"> <if test="phone != null and phone != ''">
@ -194,7 +194,7 @@
<if test="directAuditBy != null"> <if test="directAuditBy != null">
#{directAuditBy}, #{directAuditBy},
</if> </if>
<if test="directAuditTime != null and directAuditTime != ''"> <if test="directAuditTime != null">
#{directAuditTime}, #{directAuditTime},
</if> </if>
<if test="directAuditRemark != null"> <if test="directAuditRemark != null">

14
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
View File

@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into ma_part_type ( insert into ma_part_type (
<if test="paId != null and paId != 0">pa_id,</if> <if test="paId != null and paId != 0">pa_id,</if>
<if test="paName != null and paName != ''">pa_name,</if> <if test="paName != null and paName != ''">pa_name,</if>
<if test="parentId != null and parentId != 0">parent_id,</if> parent_id, <!-- 始终插入 parentId -->
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="num != null and num != 0">num,</if> <if test="num != null and num != 0">num,</if>
<if test="unitId != null and unitId != ''">unit_id,</if> <if test="unitId != null and unitId != ''">unit_id,</if>
<if test="buyPrice != null and buyPrice != 0">buy_price,</if> <if test="buyPrice != null and buyPrice != 0">buy_price,</if>
<if test="level != null and level != 0">level,</if> level, <!-- 始终插入 level -->
<if test="warnNum != null and warnNum != 0">warn_num,</if> <if test="warnNum != null and warnNum != 0">warn_num,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
@ -47,13 +47,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) values ( ) values (
<if test="paId != null and paId != 0">#{paId},</if> <if test="paId != null and paId != 0">#{paId},</if>
<if test="paName != null and paName != ''">#{paName},</if> <if test="paName != null and paName != ''">#{paName},</if>
<if test="parentId != null and parentId != 0">#{parentId},</if> COALESCE(#{parentId}, 0), <!-- 如果 parentId 为空，则设置为 0 -->
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="num != null and num != ''">#{num},</if> <if test="num != null and num != 0">#{num},</if>
<if test="unitId != null and unitId != ''">#{unitId},</if> <if test="unitId != null and unitId != ''">#{unitId},</if>
<if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if> <if test="buyPrice != null and buyPrice != 0">#{buyPrice},</if>
<if test="level != null and level != ''">#{level},</if> COALESCE(#{level}, 1), <!-- 如果 level 为空，则设置为 1 -->
<if test="warnNum != null and warnNum != ''">#{warnNum},</if> <if test="warnNum != null and warnNum != 0">#{warnNum},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if> <if test="companyId != null and companyId != ''">#{companyId},</if>