Merge remote-tracking branch 'origin/master'

无关风月

15 小时以前 a858d0f96cd50b7587cd0ac7291e0432e48ac759

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTaskController.java

@@ -32,6 +32,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -411,80 +412,83 @@
    public void exportExcel(@RequestBody TaskListQuery query) {
        List<SysUser> sysUsers = sysUserService.selectAllList();
        List<TLocation> locationList = locationService.list();
        if (StringUtils.hasLength(query.getDeptName())){
            List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
            List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
                    .stream().map(TProjectDept::getId).collect(Collectors.toList());
            for (TProjectDept tProjectDept : list) {
                if (tProjectDept.getParentId().equals("0")){
                    List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
                            .stream().map(TProjectDept::getId).collect(Collectors.toList());
                    listIds.addAll(collect);
        if(CollectionUtils.isEmpty(query.getTaskIds())){

            if (StringUtils.hasLength(query.getDeptName())){
                List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
                List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
                        .stream().map(TProjectDept::getId).collect(Collectors.toList());
                for (TProjectDept tProjectDept : list) {
                    if (tProjectDept.getParentId().equals("0")){
                        List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
                                .stream().map(TProjectDept::getId).collect(Collectors.toList());
                        listIds.addAll(collect);
                    }
                }
                List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
                        .stream().map(TDept::getId).collect(Collectors.toList());
                listIds.addAll(deptIds);
                if (listIds.isEmpty()){
                    listIds.add("0");
                }
                List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
                        .map(SysUser::getUserId).collect(Collectors.toList());
                query.setPatrolInspectorIds( collect);
                if (StringUtils.hasLength(query.getPhonenumber())){
                    List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                            sysUser.getPhonenumber().contains(query.getPhonenumber())
                                    && listIds.contains(sysUser.getDeptId())
                    ).map(SysUser::getUserId).collect(Collectors.toList());
                    if (patrolInspectorIds.isEmpty()){
                        patrolInspectorIds.add(0L);
                    }
                    query.setPatrolInspectorIds(patrolInspectorIds);
                }
            }
            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
                    .stream().map(TDept::getId).collect(Collectors.toList());
            listIds.addAll(deptIds);
            if (listIds.isEmpty()){
                listIds.add("0");
            }
            List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))
                    .map(SysUser::getUserId).collect(Collectors.toList());
            query.setPatrolInspectorIds( collect);
            if (StringUtils.hasLength(query.getPhonenumber())){
                List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                        sysUser.getPhonenumber().contains(query.getPhonenumber())
                                && listIds.contains(sysUser.getDeptId())
                ).map(SysUser::getUserId).collect(Collectors.toList());
                query.setPatrolInspectorIds(patrolInspectorIds);
                if (!query.getPatrolInspectorIds().isEmpty()){
                    // 取交集
                    patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
                }
                query.setPatrolInspectorIds(patrolInspectorIds);
                if (patrolInspectorIds.isEmpty()){
                    patrolInspectorIds.add(0L);
                }
                query.setPatrolInspectorIds(patrolInspectorIds);
            }
        }
        if (StringUtils.hasLength(query.getPhonenumber())){
            List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
                    sysUser.getPhonenumber().contains(query.getPhonenumber())
            ).map(SysUser::getUserId).collect(Collectors.toList());
            query.setPatrolInspectorIds(patrolInspectorIds);
            if (!query.getPatrolInspectorIds().isEmpty()){
                // 取交集
                patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
            if (query.getClearStatus()!=null){
                List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
                        .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
                query.setTaskIds(collect);
                if (collect.isEmpty()){
                    collect.add("0");
                }
            }
            query.setPatrolInspectorIds(patrolInspectorIds);
            if (patrolInspectorIds.isEmpty()){
                patrolInspectorIds.add(0L);
            }
        }
        if (query.getClearStatus()!=null){
            List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
                    .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());
            query.setTaskIds(collect);
            if (collect.isEmpty()){
                collect.add("0");
            }
        }
        if (StringUtils.hasLength(query.getLocationType())){
            List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
                    .collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add("0");
            }
            query.setLocationIds(collect);
        }
        if (StringUtils.hasLength(query.getLocationName())){
            List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
                    .collect(Collectors.toList());
            query.setLocationIds(collect);
            if (collect.isEmpty()){
                collect.add("0");
            }else{
                collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
            if (StringUtils.hasLength(query.getLocationType())){
                List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
                        .collect(Collectors.toList());
                if (collect.isEmpty()){
                    collect.add("0");
                }
                query.setLocationIds(collect);
            }
            if (StringUtils.hasLength(query.getLocationName())){
                List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
                        .collect(Collectors.toList());
                query.setLocationIds(collect);
                if (collect.isEmpty()){
                    collect.add("0");
                }else{
                    collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
                    if (collect.isEmpty()){
                        collect.add("0");
                    }
                    query.setLocationIds(collect);
                }
            }
        }
        List<TaskListVO> list = taskCleanerService.exportList(query);