bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
hayu 2025-08-06 16:55:34 +08:00
parent 342f27cfc8
commit d8e5d565e0
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -434,28 +434,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getElectronicLabel" resultType="com.bonus.material.ma.domain.Machine"> <select id="getElectronicLabel" resultType="com.bonus.material.ma.domain.Machine">
SELECT SELECT
mm.ma_id as maId, mm.ma_id as maId,
mt2.type_name as materialName, mt2.type_name as materialName,
mt.type_name as materialModel, mt.type_name as materialModel,
mm.ma_code as maCode, mm.ma_code as maCode,
mm.this_check_time as thisCheckTime, mm.this_check_time as thisCheckTime,
mm.next_check_time as nextCheckTime, mm.next_check_time as nextCheckTime,
mm.check_man as checkMan, mm.check_man as checkMan,
mm.inspect_man as inspectMan, mm.inspect_man as inspectMan,
mm.phone, mm.phone,
'合格' as inspectStatus, '合格' as inspectStatus,
mm.ma_vender as maVender, mm.ma_vender as maVender,
mm.ex_code as exCode, mm.ex_code as exCode,
mm.ex_url as exUrl, mm.ex_url as exUrl,
mm.is_jj as isJj, mm.is_jj as isJj,
mm.type_id as typeId mm.type_id as typeId
FROM FROM
ma_machine mm ma_machine mm
LEFT JOIN ma_type mt on mt.type_id=mm.type_id LEFT JOIN ma_type mt on mt.type_id=mm.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
WHERE WHERE
mm.ma_status = '2' and mm.ma_code like concat('%', #{maCode}, '%')
mm.ma_code like concat('%', #{maCode}, '%') <if test="maId != null">
and mm.ma_id = #{maId}
</if>
</select> </select>
<select id="selectMaId" resultType="java.lang.Long"> <select id="selectMaId" resultType="java.lang.Long">