This commit is contained in:
parent
d17284eef8
commit
f02df31083
|
|
@ -2034,7 +2034,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
AND mt2.del_flag = '0'
|
AND mt2.del_flag = '0'
|
||||||
|
|
||||||
WHERE
|
WHERE
|
||||||
mm.ma_code = #{maCode}
|
mm.ma_code like concat('%', #{maCode} ,'%')
|
||||||
</select>
|
</select>
|
||||||
<select id="getMachineByMaId" resultType="com.bonus.material.back.domain.vo.MaCodeVo">
|
<select id="getMachineByMaId" resultType="com.bonus.material.back.domain.vo.MaCodeVo">
|
||||||
SELECT mm.ma_id AS maId,
|
SELECT mm.ma_id AS maId,
|
||||||
|
|
|
||||||
|
|
@ -2296,10 +2296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
SUM( sai.num ) AS leaseNum,
|
SUM( sai.num ) AS leaseNum,
|
||||||
SUM( CASE WHEN sai.STATUS = 0 THEN sai.num ELSE 0 END ) AS useNum,
|
SUM( CASE WHEN sai.STATUS = 0 THEN sai.num ELSE 0 END ) AS useNum,
|
||||||
SUM( CASE WHEN sai.STATUS = 1 THEN sai.num ELSE 0 END ) AS backNum,
|
SUM( CASE WHEN sai.STATUS = 1 THEN sai.num ELSE 0 END ) AS backNum,
|
||||||
CASE
|
cla.sub_unit_name AS subUnitName
|
||||||
WHEN cla.sub_unit_name IS NOT NULL AND cla.sub_unit_name != '' THEN cla.sub_unit_name
|
|
||||||
ELSE bz.ssfbdw
|
|
||||||
END AS subUnitName
|
|
||||||
FROM
|
FROM
|
||||||
clz_slt_agreement_info sai
|
clz_slt_agreement_info sai
|
||||||
LEFT JOIN clz_bm_agreement_info bai ON sai.agreement_id = bai.agreement_id
|
LEFT JOIN clz_bm_agreement_info bai ON sai.agreement_id = bai.agreement_id
|
||||||
|
|
@ -2308,7 +2305,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
LEFT JOIN ma_type mt ON sai.type_id = mt.type_id
|
LEFT JOIN ma_type mt ON sai.type_id = mt.type_id
|
||||||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
||||||
LEFT JOIN clz_lease_apply_info cla ON sai.lease_id = cla.id
|
LEFT JOIN clz_lease_apply_info cla ON sai.lease_id = cla.id
|
||||||
LEFT JOIN `micro-tool`.bzgl_bz bz ON bz.bzmc = bui.unit_name
|
|
||||||
WHERE
|
WHERE
|
||||||
bp.pro_id = #{proId}
|
bp.pro_id = #{proId}
|
||||||
AND sai.type_id = #{typeId}
|
AND sai.type_id = #{typeId}
|
||||||
|
|
@ -2318,22 +2314,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
mt.type_name LIKE CONCAT('%',#{keyWord},'%') OR
|
mt.type_name LIKE CONCAT('%',#{keyWord},'%') OR
|
||||||
bui.unit_name LIKE CONCAT('%',#{keyWord},'%') OR
|
bui.unit_name LIKE CONCAT('%',#{keyWord},'%') OR
|
||||||
bp.pro_name LIKE CONCAT('%',#{keyWord},'%') OR
|
bp.pro_name LIKE CONCAT('%',#{keyWord},'%') OR
|
||||||
(
|
cla.sub_unit_name LIKE CONCAT('%',#{keyWord},'%')
|
||||||
CASE
|
|
||||||
WHEN cla.sub_unit_name IS NOT NULL AND cla.sub_unit_name != '' THEN cla.sub_unit_name
|
|
||||||
ELSE bz.ssfbdw
|
|
||||||
END
|
|
||||||
) LIKE CONCAT('%',#{keyWord},'%')
|
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
GROUP BY
|
GROUP BY
|
||||||
bp.pro_id,
|
bp.pro_id,
|
||||||
sai.type_id,
|
sai.type_id,
|
||||||
bui.unit_name,
|
bui.unit_name
|
||||||
CASE
|
|
||||||
WHEN cla.sub_unit_name IS NOT NULL AND cla.sub_unit_name != '' THEN cla.sub_unit_name
|
|
||||||
ELSE bz.ssfbdw
|
|
||||||
END
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="batchQueryLeaseDemand" resultType="com.bonus.material.clz.domain.vo.MaterialProvideNumInfo">
|
<select id="batchQueryLeaseDemand" resultType="com.bonus.material.clz.domain.vo.MaterialProvideNumInfo">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue