feat:财务报表优化树形搜索

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java

@@ -5,10 +5,12 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class DeptAllListDto {
+public class DeptAllListDto  {
 
     private Long deptId;
 
     private List<Long> deptIds;
 
+    private Boolean isInclude;
+
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/UserDTO.java

@@ -20,6 +20,7 @@
 package com.bsd.pjcloud.admin.api.dto;
 
 import com.bsd.pjcloud.admin.api.entity.SysUser;
+import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,7 +35,7 @@ import java.util.List;
 @Data
 @Schema(description = "系统用户传输对象")
 @EqualsAndHashCode(callSuper = true)
-public class UserDTO extends SysUser {
+public class UserDTO extends SysUser implements BaseIsIncludeTreeInterface {
 
     /**
      * 角色ID
@@ -72,11 +73,13 @@ public class UserDTO extends SysUser {
     private List<Long> userIds;
 
     /**
-     * false 当前部门
-     * true 当前部门及子部门
+     * 部门ids
      */
-    private Boolean isDeepDept = false;
-
     private List<Long> deptIds;
 
+    /**
+     * 是否包含部门ids
+     */
+    private Boolean isInclude;
+
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/utils/DataUtil.java

@@ -7,10 +7,7 @@ import com.bsd.pjcloud.admin.api.entity.SysMenu;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.vo.SysUserFaceVo;
 import com.bsd.pjcloud.admin.api.vo.UserVO;
-import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
-import com.bsd.pjcloud.admin.api.vo.base.BaseFacesInterface;
-import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
-import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
+import com.bsd.pjcloud.admin.api.vo.base.*;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import lombok.experimental.UtilityClass;
 

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/base/BaseIsDeepDeptTreeInterface.java

@@ -0,0 +1,27 @@
+package com.bsd.pjcloud.admin.api.vo.base;
+
+import java.util.List;
+
+public interface BaseIsDeepDeptTreeInterface {
+    /**
+     * 部门ids
+     */
+    List<Long> getDeptIds();
+
+    void setDeptIds(List<Long> deptIds);
+
+    /**
+     * 部门id
+     */
+    Long getDeptId();
+
+    void setDeptId(Long deptId);
+
+    /**
+     * 是否深度搜索deptIds
+     * @return
+     */
+    Boolean getIsDeepDept();
+
+    void setIsDeepDept(Boolean isDeepDept);
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/base/BaseIsIncludeTreeInterface.java

@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.admin.api.vo.base;
+
+import java.util.List;
+
+public interface BaseIsIncludeTreeInterface {
+
+    /**
+     * 是否包含部门ids
+     */
+    Boolean getIsInclude();
+
+    void setIsInclude(Boolean isInclude);
+
+    /**
+     * 部门ids
+     */
+    List<Long> getDeptIds();
+
+    void setDeptIds(List<Long> deptIds);
+}