|
@@ -133,19 +133,18 @@
|
|
|
|
|
|
<select id="getActivationRecord" resultType="com.abi.qms.platform.dao.vo.result.ActivationRecordVO">
|
|
|
select qbm.box_code,ba.active_name,bm.material_name,
|
|
|
- qbm.active_time,ui.user_name
|
|
|
+ qbm.active_time,qbm.active_user_name as userName
|
|
|
from qr_box_mapping qbm
|
|
|
left join qr_package qp on qbm.package_id=qp.id
|
|
|
left join base_material bm on bm.id = qp.material_id
|
|
|
left join base_active ba on ba.id =bm.active_id
|
|
|
- left join user_info ui on ui.id=qbm.create_by
|
|
|
<where>
|
|
|
qbm.active_status=1
|
|
|
<if test="req.month != null and req.month !=''">
|
|
|
AND DATE_FORMAT(qbm.active_time,'%Y-%m') = #{req.month}
|
|
|
</if>
|
|
|
<if test="id != null">
|
|
|
- AND ui.id =#{id}
|
|
|
+ AND qbm.active_user_id =#{id}
|
|
|
</if>
|
|
|
</where>
|
|
|
ORDER BY qbm.active_time DESC
|