diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml index 51e4270d..dbc761b8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml @@ -1297,12 +1297,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(sai.num) num, mt.lease_price as leasePrice, ANY_VALUE(mt.type_id) as typeId, - mt2.is_statics as isStatics + mt2.is_statics as isStatics, + mm.ma_code AS maCode FROM slt_agreement_info sai LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id LEFT JOIN ma_type mt ON sai.type_id = mt.type_id LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id + LEFT JOIN ma_machine mm on sai.ma_id = mm.ma_id WHERE sai.is_slt = 0 AND sai.end_time IS NULL @@ -1321,6 +1323,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt.type_name like concat ('%', #{typeModelName}, '%') - GROUP BY bp.pro_name,mt.type_id + + AND mm.ma_code like concat ('%', #{maCode}, '%') + + GROUP BY bp.pro_name,mt.type_id,sai.ma_id