退料申请只显示领料的机具类型层级
This commit is contained in:
parent
5640e7cde7
commit
ce5b8221fe
|
|
@ -118,8 +118,6 @@ public interface BackApplyMapper {
|
||||||
* @param bean
|
* @param bean
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<TypeTreeNode> getUseTypeTree(BackApplyInfo bean);
|
|
||||||
|
|
||||||
List<TypeTreeNode> getUseTypeTreeL4(BackApplyInfo bean);
|
List<TypeTreeNode> getUseTypeTreeL4(BackApplyInfo bean);
|
||||||
|
|
||||||
List<TypeTreeNode> getUseTypeTreeL3(List<Long> list);
|
List<TypeTreeNode> getUseTypeTreeL3(List<Long> list);
|
||||||
|
|
|
||||||
|
|
@ -369,7 +369,6 @@ public class BackApplyServiceImpl implements BackApplyService {
|
||||||
List<TypeTreeNode> listL3 = new ArrayList<>();
|
List<TypeTreeNode> listL3 = new ArrayList<>();
|
||||||
List<TypeTreeNode> listL21 = new ArrayList<>();
|
List<TypeTreeNode> listL21 = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
//list = backApplyMapper.getUseTypeTree(bean);
|
|
||||||
listL4 = backApplyMapper.getUseTypeTreeL4(bean);
|
listL4 = backApplyMapper.getUseTypeTreeL4(bean);
|
||||||
List<Long> list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList());
|
List<Long> list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList());
|
||||||
listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds);
|
listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds);
|
||||||
|
|
|
||||||
|
|
@ -610,86 +610,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<!-- LEVEL ASC;-->
|
<!-- LEVEL ASC;-->
|
||||||
<!-- </select>-->
|
<!-- </select>-->
|
||||||
|
|
||||||
<select id="getUseTypeTree" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
|
|
||||||
-- 查询从第四级到第一级的所有类型及相关信息
|
|
||||||
SELECT
|
|
||||||
t4.type_id,
|
|
||||||
t4.type_name,
|
|
||||||
t4.parent_id,
|
|
||||||
t4.unit_name,
|
|
||||||
t4.company_id,
|
|
||||||
COALESCE(SUM(CASE WHEN sai.agreement_id = #{agreementId} AND sai.status = '0' THEN sai.num ELSE 0 END), 0) AS num,
|
|
||||||
4 AS LEVEL
|
|
||||||
FROM
|
|
||||||
ma_type t4
|
|
||||||
LEFT JOIN slt_agreement_info sai ON t4.type_id = sai.type_id
|
|
||||||
WHERE
|
|
||||||
t4.level = 4
|
|
||||||
AND EXISTS (
|
|
||||||
SELECT 1 FROM slt_agreement_info sai2
|
|
||||||
WHERE sai2.type_id = t4.type_id AND sai2.agreement_id = #{agreementId} AND sai2.status = '0'
|
|
||||||
)
|
|
||||||
GROUP BY
|
|
||||||
t4.type_id
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
t3.type_id,
|
|
||||||
t3.type_name,
|
|
||||||
t3.parent_id,
|
|
||||||
t3.unit_name,
|
|
||||||
t3.company_id,
|
|
||||||
0 AS num,
|
|
||||||
3 AS LEVEL
|
|
||||||
FROM
|
|
||||||
ma_type t3
|
|
||||||
INNER JOIN (
|
|
||||||
SELECT DISTINCT t4.parent_id
|
|
||||||
FROM ma_type t4
|
|
||||||
WHERE t4.level = 4
|
|
||||||
) AS parent_t4 ON t3.type_id = parent_t4.parent_id
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
t2.type_id,
|
|
||||||
t2.type_name,
|
|
||||||
t2.parent_id,
|
|
||||||
t2.unit_name,
|
|
||||||
t2.company_id,
|
|
||||||
0 AS num,
|
|
||||||
2 AS LEVEL
|
|
||||||
FROM
|
|
||||||
ma_type t2
|
|
||||||
INNER JOIN (
|
|
||||||
SELECT DISTINCT t3.parent_id
|
|
||||||
FROM ma_type t3
|
|
||||||
WHERE t3.level = 3
|
|
||||||
) AS parent_t3 ON t2.type_id = parent_t3.parent_id
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
t1.type_id,
|
|
||||||
t1.type_name,
|
|
||||||
t1.parent_id,
|
|
||||||
t1.unit_name,
|
|
||||||
t1.company_id,
|
|
||||||
0 AS num,
|
|
||||||
1 AS LEVEL
|
|
||||||
FROM
|
|
||||||
ma_type t1
|
|
||||||
INNER JOIN (
|
|
||||||
SELECT DISTINCT t2.parent_id
|
|
||||||
FROM ma_type t2
|
|
||||||
WHERE t2.level = 2
|
|
||||||
) AS parent_t2 ON t1.type_id = parent_t2.parent_id
|
|
||||||
|
|
||||||
ORDER BY
|
|
||||||
LEVEL ASC, type_id;
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<select id="getUseTypeTreeL4" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
|
<select id="getUseTypeTreeL4" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
|
||||||
SELECT
|
SELECT
|
||||||
t4.type_id,
|
t4.type_id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue