问题修改
This commit is contained in:
parent
9a820b42c3
commit
e37ff62fd3
|
|
@ -496,7 +496,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
mi.check_man as checkMan,
|
||||
mi.phone,
|
||||
mi.result,null AS reportCode,null AS reportUrl,
|
||||
mi.type
|
||||
mi.type,
|
||||
'1' as devType
|
||||
FROM
|
||||
ws_ma_info mi
|
||||
WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1 and DATEDIFF(mi.next_check_time,NOW()) > 0
|
||||
|
|
@ -512,7 +513,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
ifnull(mm.inspect_man,"高民") as checkMan,
|
||||
"0551-63703966" as phone,
|
||||
"合格" as result,mm.ex_code AS reportCode,mm.ex_url AS reportUrl,
|
||||
is_jj as type
|
||||
is_jj as type,
|
||||
'2' as devType
|
||||
FROM ma_machine mm
|
||||
LEFT JOIN ma_type mt on mm.type_id = mt.type_id
|
||||
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
|
||||
|
|
|
|||
Loading…
Reference in New Issue