ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -228,20 +228,21 @@ } } // 超级管理员 查询所有任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds) .between(TTask::getImplementTime, startTime, endTime)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds) // .between(TTask::getImplementTime, startTime, endTime)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -503,19 +504,20 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds)); } } // // 查询点位类型 // if(StringUtils.isEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -687,19 +689,20 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -992,20 +995,21 @@ sysUsers = sysUserService.selectListByDeptId(deptId); } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds) .between(TTask::getImplementTime, startTime, endTime)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds) // .between(TTask::getImplementTime, startTime, endTime)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1) @@ -1247,20 +1251,21 @@ map.put("totalLocationNum", locationList.size()); } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds) .between(TTask::getImplementTime, startTime, endTime)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds) // .between(TTask::getImplementTime, startTime, endTime)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -1432,14 +1437,25 @@ .in(TTask::getLocationId, locationIds)); // 查询片区负责人 // List<SysUser> users = sysUserService.selectUserByNickName("片区负责人"); List<SysUser> users = sysUserService.selectUserByNickName("片区负责人"); for (TLocation tLocation : locationList) { // if(!CollectionUtils.isEmpty(users)){ // // } long count = tasks.stream().filter(task -> task.getLocationId().equals(tLocation.getId())).count(); tLocation.setTaskNum(count); if(!CollectionUtils.isEmpty(users)){ List<Long> userIds = users.stream().map(SysUser::getUserId).collect(Collectors.toList()); List<TTask> taskList = taskCleanService.lambdaQuery().notIn(TTask::getPatrolInspector, userIds).list(); if(!CollectionUtils.isEmpty(taskList)){ List<String> collect = taskList.stream().map(TTask::getId).collect(Collectors.toList()); long count = taskList.stream().filter(task -> task.getLocationId().equals(tLocation.getId()) && collect.contains(task.getId())).count(); tLocation.setTaskNum(count); }else { long count = tasks.stream().filter(task -> task.getLocationId().equals(tLocation.getId())).count(); tLocation.setTaskNum(count); } }else { long count = tasks.stream().filter(task -> task.getLocationId().equals(tLocation.getId())).count(); tLocation.setTaskNum(count); } } return R.ok(locationList); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -260,19 +260,20 @@ map.put("totalLocationNum", locationList.size()); } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -471,20 +472,21 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds) .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime())); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds) // .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime())); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -762,19 +764,20 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds).between(TTask::getImplementTime, startTime, endTime)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds).between(TTask::getImplementTime, startTime, endTime)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -958,19 +961,20 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -1128,19 +1132,20 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); @@ -1330,19 +1335,20 @@ } } // 超级管理员 查询所有的任务列表 List<TTask> taskList = new ArrayList<>(); List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getPatrolInspector, userId)); if(CollectionUtils.isEmpty(query.getProjectId())){ // 查询点位类型 if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // 查询点位 List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) .in(TLocation::getLocationType, query.getLocationTypeId())); if(!CollectionUtils.isEmpty(locationList)){ List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) .in(TTask::getLocationId, locationIds)); } } // if(StringUtils.isNotEmpty(query.getLocationTypeId())){ // // 查询点位 // List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class) // .in(TLocation::getLocationType, query.getLocationTypeId())); // if(!CollectionUtils.isEmpty(locationList)){ // List<String> locationIds = locationList.stream().map(TLocation::getId).collect(Collectors.toList()); // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) // .in(TTask::getLocationId, locationIds)); // } // } // 查询所有项目部的任务列表 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus, 1)); ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -207,4 +207,6 @@ List<SysUser> selectListByDeptIds(@Param("projectIds")List<String> projectIds); Integer selectUserCount(@Param("projectIds")List<String> projectIds, @Param("deptType")Integer deptType); List<SysUser> selectUserByNickName(@Param("nickName")String nickName); } ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -299,4 +299,5 @@ */ Integer selectUserCount(List<String> projectId, Integer deptType); List<SysUser> selectUserByNickName(String nickName); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -764,6 +764,11 @@ } @Override public List<SysUser> selectUserByNickName(String nickName) { return userMapper.selectUserByNickName(nickName); } @Override public SysUser selectByPhone(String phonenumber) { return userMapper.selectByPhone(phonenumber); } ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -334,6 +334,14 @@ </foreach> </if> </select> <select id="selectUserByNickName" resultType="com.ruoyi.common.core.domain.entity.SysUser"> select * from sys_user where status = 0 and del_flag = 0 <if test="nickName != null and nickName != ''"> AND nick_name = #{nickName} </if> </select> <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> insert into sys_user(
