bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:6de69becb885b0cb3fe6186e36d88930b5e301c5
Branches Tags
bonus:master
bonus:branch_basic
..
compare: bonus:b8905ea4f4610538abe69f77343b6c3b68a17cd4
Branches Tags
bonus:master
bonus:branch_basic

No commits in common. "6de69becb885b0cb3fe6186e36d88930b5e301c5" and "b8905ea4f4610538abe69f77343b6c3b68a17cd4" have entirely different histories.
6de69becb8 ... b8905ea4f4

1 changed files with 12 additions and 12 deletions
Show Stats Expand all files Collapse all files

24
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -48,10 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where sai.is_slt = 0 and sai.end_time is null
AND mt2.is_statics = #{isStatics}
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
AND mt2.type_name = #{typeName}
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
AND mt.type_name = #{typeModelName}
</if>
GROUP BY bp.pro_id
</select>
@ -249,10 +249,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bp.pro_name like concat ('%', #{proName}, '%')
</if>
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
AND mt2.type_name = #{typeName}
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
AND mt.type_name = #{typeModelName}
</if>
<if test="proId != null">
GROUP BY bp.pro_id
@ -314,10 +314,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bp.pro_name like concat ('%', #{proName}, '%')
</if>
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
AND mt2.type_name = #{typeName}
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
AND mt.type_name = #{typeModelName}
</if>
</select>
@ -330,10 +330,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt2 on mt.parent_id = mt2.type_id
where mt.del_flag = 0 and mt.`level`=4
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
AND mt2.type_name = #{typeName}
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
AND mt.type_name = #{typeModelName}
</if>
</select>
<select id="getInventoryAlertName" resultType="com.bonus.material.push.domain.InventoryAlertBean">
@ -344,10 +344,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt2 on mt.parent_id = mt2.type_id
where mt.del_flag = 0 and mt.`level`=4
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
AND mt2.type_name = #{typeName}
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
AND mt.type_name = #{typeModelName}
</if>
</select>
<select id="getApproachingDetailsByUnit" resultType="java.util.Map">
@ -387,10 +387,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.del_flag = 0
AND mt.`level` =4
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
AND mt2.type_name = #{typeName}
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
AND mt.type_name = #{typeModelName}
</if>
</select>