Compare commits
No commits in common. "78e2a37c9cdcc8af54e32bd5949b9236609644b0" and "19791eb43671baf7bc30ae2de933db26023b0930" have entirely different histories.
78e2a37c9c
...
19791eb436
|
|
@ -286,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
bp.pro_center as proCenter,
|
||||
bp.actual_end_date as actualEndDate,
|
||||
DATEDIFF(NOW(), bp.actual_end_date) as daysDiff,
|
||||
sai.num num,
|
||||
sum(sai.num) num,
|
||||
mt.type_name as typeModelName,
|
||||
mt.unit_name as unit,
|
||||
mt2.type_name as typeName,
|
||||
|
|
@ -298,7 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
left join ma_type mt on sai.type_id = mt.type_id
|
||||
left join ma_type mt2 on mt.parent_id = mt2.type_id
|
||||
where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null
|
||||
and sd.dept_id = #{deptId} and bp.pro_center is not null
|
||||
and sd.dept_id = #{deptId}
|
||||
<if test="proId != null">
|
||||
AND bp.pro_id = #{proId}
|
||||
</if>
|
||||
|
|
@ -317,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="typeModelName != null and typeModelName !=''">
|
||||
AND mt.type_name like concat ('%', #{typeModelName}, '%')
|
||||
</if>
|
||||
|
||||
</select>
|
||||
<select id="getInventoryAlert" resultType="com.bonus.material.push.domain.InventoryAlertBean">
|
||||
select
|
||||
|
|
|
|||
Loading…
Reference in New Issue