bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.56:3000/bonus/cqdevicemgt

This commit is contained in:
sxu 2024-08-23 15:56:24 +08:00
parent 857d835e40 18dbf81e27
commit 0430a42004
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -369,10 +369,13 @@ 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 {
// 先查第四层类型
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());
// 根据第四层parentId 查第三层类型
listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds); listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds);
List<Long> list3ParentIds = listL3.stream().map(o -> o.getParentId()).collect(Collectors.toList()); List<Long> list3ParentIds = listL3.stream().map(o -> o.getParentId()).collect(Collectors.toList());
// 根据第三层parentId 查第1.2层类型
listL21 = backApplyMapper.getUseTypeTreeL21(list3ParentIds); listL21 = backApplyMapper.getUseTypeTreeL21(list3ParentIds);
list.addAll(listL4); list.addAll(listL4);
list.addAll(listL3); list.addAll(listL3);

26
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -612,24 +612,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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, mt.type_id,
t4.type_name, mt.type_name,
t4.parent_id, mt.parent_id,
t4.unit_name, mt.unit_name as unitNames,
t4.company_id, mt.company_id,
COALESCE(SUM(CASE WHEN sai.agreement_id = #{agreementId} AND sai.status = '0' THEN sai.num ELSE 0 END), 0) AS num, SUM( CASE WHEN sai.agreement_id = 78 AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
4 AS LEVEL mt.LEVEL
FROM FROM
ma_type t4 ma_type mt
LEFT JOIN slt_agreement_info sai ON t4.type_id = sai.type_id LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
WHERE WHERE
t4.level = 4 EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = 78 AND sai2.STATUS = '0' and sai.lease_type = 0)
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 GROUP BY
t4.type_id mt.type_id
</select> </select>
<select id="getUseTypeTreeL3" resultType="com.bonus.sgzb.material.domain.TypeTreeNode"> <select id="getUseTypeTreeL3" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">