修改导出业务

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptTreeSelect.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.dept.model;
 
 import java.util.List;
 import java.util.ArrayList;
+
 import com.mortals.xhx.module.dept.model.vo.DeptVo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.mortals.xhx.module.staff.model.StaffEntity;
@@ -11,29 +12,32 @@ import org.springframework.util.ObjectUtils;
 import java.io.Serializable;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 /**
-* 部门信息前端映射树结构实体类
-*
-* @author zxfei
-* @date 2023-03-06
-*/
+ * 部门信息前端映射树结构实体类
+ *
+ * @author zxfei
+ * @date 2023-03-06
+ */
 @Data
-public class DeptTreeSelect  implements Serializable {
+public class DeptTreeSelect implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 节点ID
-    */
+     * 节点ID
+     */
     private Long id;
 
     /**
-    * 节点名称
-    */
+     * 节点名称
+     */
     private String label;
 
+    private Integer personNum;
+
     /**
-    * 子节点
-    */
+     * 子节点
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<DeptTreeSelect> children;
 
@@ -41,15 +45,21 @@ public class DeptTreeSelect  implements Serializable {
      * 子节点
      */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<Map<String,Object>> personList;
+    private List<Map<String, Object>> personList;
 
     public DeptTreeSelect(DeptEntity entity) {
         this.id = entity.getId();
         this.label = entity.getDeptName();
-        if(!ObjectUtils.isEmpty(entity.getChildren())){
+        this.personNum = entity.getPersonNum();
+        if (!ObjectUtils.isEmpty(entity.getChildren())) {
             this.children = entity.getChildren().stream().map(DeptTreeSelect::new).collect(Collectors.toList());
+
+            int sum = entity.getChildren().stream().mapToInt(i -> i.getPersonNum()).sum();
+            this.personNum = this.personNum + sum;
         }
         this.personList = entity.getPersonList();
+
+
     }
 
 }