设备标签二改 新增下拉框
This commit is contained in:
parent
69496ef5fb
commit
689abd905d
|
|
@ -60,17 +60,19 @@
|
|||
ORDER BY b.is_bind ASC
|
||||
</select>
|
||||
<select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
|
||||
SELECT a.ma_id,a.label_code,a.bind_time,a.label_type,mt.type_id,mt.type_name,
|
||||
SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
|
||||
mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
|
||||
mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code
|
||||
FROM ma_label_bind a
|
||||
mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
|
||||
FROM ma_machine_label b
|
||||
left join ma_label_bind a on a.ma_id = b.ma_id
|
||||
LEFT JOIN ma_type mt ON a.type_id = mt.type_id
|
||||
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
|
||||
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
|
||||
LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
|
||||
LEFT JOIN ma_type_repair mtk ON mtk.type_id = mt.type_id
|
||||
LEFT JOIN sys_dic dic ON dic.id = a.label_type
|
||||
LEFT JOIN ma_machine ma on ma.ma_id = a.ma_id
|
||||
LEFT JOIN sys_dic dic ON dic.id = b.label_type
|
||||
LEFT JOIN ma_machine ma ON ma.ma_id = a.ma_id
|
||||
LEFT JOIN sys_user user on user.user_id =a.binder
|
||||
WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
|
||||
<where>
|
||||
<if test="labelCode != null and labelCode != ''"> and a.label_code = #{labelCode}</if>
|
||||
|
|
@ -163,7 +165,7 @@
|
|||
</delete>
|
||||
|
||||
<update id="updateMaLabelBindByMaIds" parameterType="Long">
|
||||
update ma_label_bind set status = '0' where id = #{id}
|
||||
update ma_label_bind set status = '2' where id = #{id}
|
||||
</update>
|
||||
|
||||
<select id="selectMaMachineMaId" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO">
|
||||
|
|
|
|||
Loading…
Reference in New Issue