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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhouxain01 2023-12-25 10:09:58 +08:00
parent b427947bbf 4aa9d55c26
commit c035d39874
2 changed files with 67 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java
View File

@ -18,6 +18,8 @@ public class TypeTreeNode {
private String num; private String num;
private String unitName;
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
private String level; private String level;

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

@ -291,7 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tt.task_status as taskStatus, tt.task_status as taskStatus,
tta.agreement_id as agreementId, tta.agreement_id as agreementId,
GROUP_CONCAT(DISTINCT bad.type_id) as typeId, GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
GROUP_CONCAT(CONCAT_WS('/', IFNULL(mt3.type_name, ''))) AS typeName GROUP_CONCAT(mt2.type_name) AS typeName
FROM FROM
back_apply_info bai back_apply_info bai
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
@ -303,8 +303,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_user us on us.user_id=bai.create_by LEFT JOIN sys_user us on us.user_id=bai.create_by
LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
WHERE WHERE
1=1 1=1
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
@ -427,6 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.parent_id, mt.parent_id,
mt.type_name, mt.type_name,
mt.`level`, mt.`level`,
mt.unit_name,
mt4.num mt4.num
FROM FROM
ma_type mt ma_type mt
@ -479,11 +478,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
subquery1.out_num - COALESCE ( subquery2.audit_num, 0 )> 0) mt4 on mt4.typeId = mt.type_id subquery1.out_num - COALESCE ( subquery2.audit_num, 0 )> 0) mt4 on mt4.typeId = mt.type_id
HAVING num> 0 HAVING num> 0
UNION ALL UNION ALL
SELECT ma_type.type_id, ma_type.parent_id,ma_type.type_name as typeCode, ma_type.`level`,0 as num SELECT ma_type.type_id, ma_type.parent_id,ma_type.type_name as typeCode, ma_type.`level`,ma_type.unit_name,0 as
num
FROM ma_type FROM ma_type
JOIN cte ON ma_type.type_id = cte.parent_id JOIN cte ON ma_type.type_id = cte.parent_id
) )
SELECT type_id as typeId, parent_id as parentId,type_name as typeName,num,`level` SELECT type_id as typeId, parent_id as parentId,type_name as typeName,num,`level`,unit_name as unitName
FROM cte FROM cte
WHERE WHERE
1=1 1=1