Procházet zdrojové kódy

feat: 设备表、广告节目单、三审报表excel导出

zengweijie před 2 roky
rodič
revize
e21040285c

+ 22 - 8
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/org/SmsbDepartmentServiceImpl.java

@@ -137,30 +137,44 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
             .eq(SmsbDepartmentDO::getTenant, tenant)
             .isNull(SmsbDepartmentDO::getParentId));
         List<SmsbDepartmentCO> departmentTree = Lists.newArrayList();
-        departmentList.forEach(department->{
+        departmentList.forEach(department -> {
             SmsbDepartmentCO smsbDepartmentCO = new SmsbDepartmentCO();
-            BeanUtils.copyProperties(department , smsbDepartmentCO);
+            BeanUtils.copyProperties(department, smsbDepartmentCO);
             smsbDepartmentCO.setChildren(this.getChilde(department.getId()));
             departmentTree.add(smsbDepartmentCO);
         });
-        log.info("tree num is :{}",departmentTree.size());
+        log.info("tree num is :{}", departmentTree.size());
         return SingleResponse.of(departmentTree);
     }
 
+    @Override
+    public List<SmsbDepartmentCO> queryDepartmentListNoHierarchy(String tenant) {
+        List<SmsbDepartmentDO> departmentList = super.list(new LambdaQueryWrapper<>(SmsbDepartmentDO.class)
+            .eq(SmsbDepartmentDO::getIsDel, 0)
+            .eq(SmsbDepartmentDO::getTenant, tenant));
+        List<SmsbDepartmentCO> result = Lists.newArrayList();
+        departmentList.forEach(department -> {
+            SmsbDepartmentCO smsbDepartmentCO = new SmsbDepartmentCO();
+            BeanUtils.copyProperties(department, smsbDepartmentCO);
+            result.add(smsbDepartmentCO);
+        });
+        return result;
+    }
+
     @Override
     public PageResponse<SmsbSimpleUserCO> queryDepartmentUserList(SmsbDepartmentCmd departmentCmd) {
-        return departmentUserService.queryUserPageByDeprIds(departmentCmd ,
+        return departmentUserService.queryUserPageByDeprIds(departmentCmd,
             Objects.nonNull(departmentCmd.getDepartmentId()) ? super.getById(departmentCmd.getDepartmentId()).getPath() : null);
     }
 
-    private List<SmsbDepartmentCO> getChilde(Long id){
+    private List<SmsbDepartmentCO> getChilde(Long id) {
         List<SmsbDepartmentDO> childList = this.list(new LambdaQueryWrapper<>(SmsbDepartmentDO.class)
-            .eq(SmsbDepartmentDO::getIsDel ,0)
+            .eq(SmsbDepartmentDO::getIsDel, 0)
             .eq(SmsbDepartmentDO::getParentId, id));
         List<SmsbDepartmentCO> finalChilds = Lists.newArrayList();
-        childList.forEach(child ->{
+        childList.forEach(child -> {
             SmsbDepartmentCO smsbDepartmentCO = new SmsbDepartmentCO();
-            BeanUtils.copyProperties(child , smsbDepartmentCO);
+            BeanUtils.copyProperties(child, smsbDepartmentCO);
             smsbDepartmentCO.setChildren(this.getChilde(child.getId()));
             finalChilds.add(smsbDepartmentCO);
         });

+ 9 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/client/org/SmsbDepartmentService.java

@@ -40,7 +40,7 @@ public interface SmsbDepartmentService {
      * @param departmentUpdate
      * @return
      */
-    Response updateDepartment(String userId , SmsbDepartmentUpdate departmentUpdate);
+    Response updateDepartment(String userId, SmsbDepartmentUpdate departmentUpdate);
 
     /**
      * 获取部门树
@@ -50,6 +50,14 @@ public interface SmsbDepartmentService {
      */
     Response queryDepartmentList(String tenant);
 
+    /**
+     * 获取所有部门,无层次结构
+     *
+     * @param tenant
+     * @return
+     */
+    List<SmsbDepartmentCO> queryDepartmentListNoHierarchy(String tenant);
+
     /**
      * 获取员工列表
      *