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

Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug

This commit is contained in:
BianLzhaoMin 2024-05-07 16:31:11 +08:00
parent 2463392124 8b5519223f
commit 8ab553727b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -865,8 +865,8 @@
slt_agreement_info slt_agreement_info
WHERE WHERE
agreement_id = #{agreementId} agreement_id = #{agreementId}
AND AND type_id = #{typeId}
type_id = #{typeId} AND status = 0
<if test="maId != null"> <if test="maId != null">
AND ma_id = #{maId} AND ma_id = #{maId}
</if> </if>
@ -903,10 +903,13 @@
ma_type mt ma_type mt
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id
LEFT JOIN slt_agreement_info sai ON sai.ma_id = mm.ma_id
LEFT JOIN sys_dic sd ON sd.id = mm.ma_status LEFT JOIN sys_dic sd ON sd.id = mm.ma_status
WHERE WHERE
mm.ma_status = '16' mm.ma_status = '16'
AND mt.type_id = #{typeId} AND mt.type_id = #{typeId}
AND sai.`status` = 0
AND sai.agreement_id = #{agreementId}
<if test="maCode != null and maCode !=''"> <if test="maCode != null and maCode !=''">
AND mm.ma_code like concat('%', #{maCode}, '%') AND mm.ma_code like concat('%', #{maCode}, '%')
</if> </if>