haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

施工管控

This commit is contained in:
cwchen 2024-08-15 16:44:36 +08:00
parent 0f45964c05
commit 8bbbfb60fe
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonTreeVo.java
View File

@ -26,6 +26,9 @@ public class PersonTreeVo {
/**层级*/ /**层级*/
private Integer level; private Integer level;
/**人员类型 0.班组人员 1.临时人员*/
private Integer type;
/**父ID*/ /**父ID*/
private String parentId; private String parentId;

15
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
View File

@ -132,7 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
0 AS parentId, 0 AS parentId,
1 AS level, 1 AS level,
0 AS isTeamLeader, 0 AS isTeamLeader,
0 AS isWarn 0 AS isWarn,
0 AS type
FROM tb_project tp FROM tb_project tp
WHERE tp.del_flag = 0 WHERE tp.del_flag = 0
UNION ALL UNION ALL
@ -142,7 +143,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tpp.pro_id AS parentId, tpp.pro_id AS parentId,
2 AS level, 2 AS level,
0 AS isTeamLeader, 0 AS isTeamLeader,
0 AS isWarn 0 AS isWarn,
0 AS type
FROM tb_project_power tpp FROM tb_project_power tpp
LEFT JOIN tb_project tp ON tpp.pro_id = tp.id AND tp.del_flag = 0 LEFT JOIN tb_project tp ON tpp.pro_id = tp.id AND tp.del_flag = 0
WHERE tpp.del_flag = 0 WHERE tpp.del_flag = 0
@ -153,7 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CONCAT('tower','-',tdu.gt_id) AS parentId, CONCAT('tower','-',tdu.gt_id) AS parentId,
3 AS level, 3 AS level,
0 AS isTeamLeader, 0 AS isTeamLeader,
0 AS isWarn 0 AS isWarn,
0 AS type
FROM tb_dev_use tdu FROM tb_dev_use tdu
LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0 LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0
@ -166,7 +169,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CONCAT('team','-',tpe.team_id) AS parentId, CONCAT('team','-',tpe.team_id) AS parentId,
4 AS level, 4 AS level,
IF(twt.team_leader_id = tpe.id,1,0) AS isTeamLeader, IF(twt.team_leader_id = tpe.id,1,0) AS isTeamLeader,
0 AS isWarn 0 AS isWarn,
0 AS type
FROM tb_dev_use tdu FROM tb_dev_use tdu
LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0 LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0
@ -180,7 +184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CONCAT('team','-',tlu.team_id) AS parentId, CONCAT('team','-',tlu.team_id) AS parentId,
4 AS level, 4 AS level,
0 AS isTeamLeader, 0 AS isTeamLeader,
0 AS isWarn 0 AS isWarn,
1 AS type
FROM tb_dev_use tdu FROM tb_dev_use tdu
LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0 LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0