|
|
|
|
@ -240,91 +240,84 @@ public class TaskInfoServiceImpl implements TaskInfoService {
|
|
|
|
|
@Override |
|
|
|
|
public PageResult<TaskInfoDO> getTaskInfoAppPage(TaskInfoPageReqVO pageReqVO) { |
|
|
|
|
|
|
|
|
|
//按标签查询
|
|
|
|
|
if (pageReqVO.getTagList() != null && pageReqVO.getTagList().size() > 0) { |
|
|
|
|
LambdaQueryWrapper<TaskTagDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.in(TaskTagDO::getTagId, pageReqVO.getTagList()); |
|
|
|
|
final List<TaskTagDO> taskTagDOS = taskTagMapper.selectList(wrapper); |
|
|
|
|
if (taskTagDOS != null && taskTagDOS.size() > 0) { |
|
|
|
|
pageReqVO.setTagList(taskTagDOS.stream().map(item->item.getTaskId()).collect(Collectors.toList())); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// //按标签查询
|
|
|
|
|
// if (pageReqVO.getTagList() != null && pageReqVO.getTagList().size() > 0) {
|
|
|
|
|
// LambdaQueryWrapper<TaskTagDO> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
// wrapper.in(TaskTagDO::getTagId, pageReqVO.getTagList());
|
|
|
|
|
// final List<TaskTagDO> taskTagDOS = taskTagMapper.selectList(wrapper);
|
|
|
|
|
// if (taskTagDOS != null && taskTagDOS.size() > 0) {
|
|
|
|
|
// pageReqVO.setTagList(taskTagDOS.stream().map(item->item.getTaskId()).collect(Collectors.toList()));
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//按时间查询
|
|
|
|
|
if (pageReqVO.getSelectWeek() != null) { |
|
|
|
|
LocalDateTime now = LocalDateTime.now(); |
|
|
|
|
LocalDateTime[] dateList = new LocalDateTime[2]; |
|
|
|
|
|
|
|
|
|
pageReqVO.setEndTime(now); |
|
|
|
|
|
|
|
|
|
LocalDateTime startTime = null; |
|
|
|
|
|
|
|
|
|
switch (pageReqVO.getSelectWeek()) { |
|
|
|
|
case 1: |
|
|
|
|
dateList[0] = now.minusDays(3); // 三天前
|
|
|
|
|
startTime = now.minusDays(3); // 三天前
|
|
|
|
|
break; |
|
|
|
|
case 2: |
|
|
|
|
dateList[0] = now.minusWeeks(1); // 一周前
|
|
|
|
|
startTime = now.minusWeeks(1); // 一周前
|
|
|
|
|
break; |
|
|
|
|
case 3: |
|
|
|
|
dateList[0] = now.minusMonths(1); // 一月前
|
|
|
|
|
startTime = now.minusMonths(1); // 一月前
|
|
|
|
|
break; |
|
|
|
|
case 4: |
|
|
|
|
dateList[0] = now.minusYears(1); // 一年前
|
|
|
|
|
startTime = now.minusYears(1); // 一年前
|
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
dateList[1] = now; |
|
|
|
|
pageReqVO.setEndDate(dateList); |
|
|
|
|
|
|
|
|
|
pageReqVO.setStartTime(startTime); |
|
|
|
|
} |
|
|
|
|
//根据不同的角色查询
|
|
|
|
|
/* |
|
|
|
|
管理员，局长，查全部 |
|
|
|
|
检查员，查自己的 |
|
|
|
|
队长 查本部门 |
|
|
|
|
*/ |
|
|
|
|
Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
|
|
|
|
|
|
|
|
|
final AdminUserDO user1 = adminUserService.getUser(loginUserId); |
|
|
|
|
if (user1.getPostIds().contains(1l) || user1.getPostIds().contains(2l)) { |
|
|
|
|
//全部
|
|
|
|
|
} else if (user1.getPostIds().contains(4l)) { |
|
|
|
|
//本部门
|
|
|
|
|
pageReqVO.setDeptId(user1.getDeptId()); |
|
|
|
|
|
|
|
|
|
} else if (user1.getPostIds().contains(5l)) { |
|
|
|
|
//自己
|
|
|
|
|
pageReqVO.setUserId(loginUserId); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
final PageResult<TaskInfoDO> taskInfoDOPageResult = taskInfoMapper.selectAppPage(pageReqVO); |
|
|
|
|
if (taskInfoDOPageResult.getList() != null && taskInfoDOPageResult.getList().size() > 0) { |
|
|
|
|
taskInfoDOPageResult.getList().forEach(item->{ |
|
|
|
|
QueryWrapper<EnterpriseInspectionsDO> wrapper = new QueryWrapper<>(); |
|
|
|
|
wrapper.eq("task_id", item.getId()); |
|
|
|
|
//根据不同的角色查询
|
|
|
|
|
/* |
|
|
|
|
管理员，局长，查全部 |
|
|
|
|
检查员，查自己的 |
|
|
|
|
队长 查本部门 |
|
|
|
|
*/ |
|
|
|
|
Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
|
|
|
|
|
|
|
|
|
final AdminUserDO user1 = adminUserService.getUser(loginUserId); |
|
|
|
|
if (user1.getPostIds().contains(1l) || user1.getPostIds().contains(2l)) { |
|
|
|
|
//全部
|
|
|
|
|
} else if (user1.getPostIds().contains(4l)) { |
|
|
|
|
//本部门
|
|
|
|
|
final List<AdminUserDO> adminUserDOS = adminUserMapper.selectList(new QueryWrapper<AdminUserDO>().eq("dept_id", user1.getDeptId())); |
|
|
|
|
|
|
|
|
|
if (adminUserDOS != null || adminUserDOS.size() > 0) { |
|
|
|
|
final List<Long> collect = adminUserDOS.stream().map(res -> res.getId()).collect(Collectors.toList()); |
|
|
|
|
wrapper.in("user_id", collect); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else if (user1.getPostIds().contains(5l)) { |
|
|
|
|
//自己
|
|
|
|
|
wrapper.eq("user_id", loginUserId); |
|
|
|
|
} |
|
|
|
|
// final PageResult<TaskInfoDO> taskInfoDOPageResult = taskInfoMapper.selectAppPage(pageReqVO);
|
|
|
|
|
|
|
|
|
|
item.setTaskExecNum(0); |
|
|
|
|
Page<TaskInfoDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); |
|
|
|
|
final IPage<TaskInfoDO> taskInfoDOIPage = taskInfoMapper.selectMyPage(page, pageReqVO); |
|
|
|
|
final PageResult<TaskInfoDO> taskInfoDOPageResult = new PageResult<>(taskInfoDOIPage.getRecords(), taskInfoDOIPage.getTotal()); |
|
|
|
|
|
|
|
|
|
List<EnterpriseInspectionsDO> enterpriseInspectionsDOList = enterpriseInspectionsMapper.selectList(wrapper); |
|
|
|
|
log.info("enterpriseInspectionsDOList:{}", enterpriseInspectionsDOList); |
|
|
|
|
if (enterpriseInspectionsDOList != null && enterpriseInspectionsDOList.size() > 0) { |
|
|
|
|
item.setTaskExecNum(enterpriseInspectionsDOList.size()); |
|
|
|
|
final List<EnterpriseInspectionsDO> collect = enterpriseInspectionsDOList.stream().filter(res -> res.getStatus() == 5).collect(Collectors.toList()); |
|
|
|
|
item.setTaskFinishNum(collect.size()); |
|
|
|
|
} |
|
|
|
|
if (taskInfoDOPageResult.getList() != null && taskInfoDOPageResult.getList().size() > 0) { |
|
|
|
|
taskInfoDOPageResult.getList().forEach(item->{ |
|
|
|
|
// item.setTaskExecNum(0);
|
|
|
|
|
//
|
|
|
|
|
// List<EnterpriseInspectionsDO> enterpriseInspectionsDOList = enterpriseInspectionsMapper.selectList(wrapper);
|
|
|
|
|
// log.info("enterpriseInspectionsDOList:{}", enterpriseInspectionsDOList);
|
|
|
|
|
// if (enterpriseInspectionsDOList != null && enterpriseInspectionsDOList.size() > 0) {
|
|
|
|
|
// item.setTaskExecNum(enterpriseInspectionsDOList.size());
|
|
|
|
|
// final List<EnterpriseInspectionsDO> collect = enterpriseInspectionsDOList.stream().filter(res -> res.getStatus() == 5).collect(Collectors.toList());
|
|
|
|
|
// item.setTaskFinishNum(collect.size());
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//获取任务标签
|
|
|
|
|
QueryWrapper<TaskTagDO> wrapper1 = new QueryWrapper<>(); |
|
|
|
|
wrapper1.eq("task_id", item.getId()); |
|
|
|
|
List<TaskTagDO> taskTagDOList = taskTagMapper.selectList(wrapper1); |
|
|
|
|
if (taskTagDOList != null && taskTagDOList.size() > 0) { |
|
|
|
|
final List<Long> collect = taskTagDOList.stream().map(TaskTagDO::getTagId).collect(Collectors.toList()); |
|
|
|
|
final List<TagLibraryDO> tagLibraryDOS = tagLibraryMapper.selectByIds(collect); |
|
|
|
|
if (tagLibraryDOS != null && tagLibraryDOS.size() > 0) { |
|
|
|
|
item.setTagList(tagLibraryDOS.stream().map(TagLibraryDO::getTagName).collect(Collectors.toList())); |
|
|
|
|
} |
|
|
|
|
final List<TagLibraryDO> tagLibraryDOS1 = tagLibraryService.listByTaskId(item.getId()); |
|
|
|
|
if (tagLibraryDOS1 != null && tagLibraryDOS1.size() > 0) { |
|
|
|
|
item.setTagList(tagLibraryDOS1.stream().map(TagLibraryDO::getTagName).collect(Collectors.toList())); |
|
|
|
|
} |
|
|
|
|
enterpriseInspectionsMapper.selectList(); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -350,9 +343,10 @@ public class TaskInfoServiceImpl implements TaskInfoService {
|
|
|
|
|
LambdaQueryWrapper<EnterpriseInspectionsDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.eq(EnterpriseInspectionsDO::getTaskId, item.getId()); |
|
|
|
|
wrapper.eq(EnterpriseInspectionsDO::getEnterpriseId, pageReqVO.getEnterpriseId()); |
|
|
|
|
final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectOne(wrapper); |
|
|
|
|
|
|
|
|
|
item.setInspectionsId(enterpriseInspectionsDO.getId()); |
|
|
|
|
final List<EnterpriseInspectionsDO> enterpriseInspectionsDO = enterpriseInspectionsMapper.selectList(wrapper); |
|
|
|
|
if (enterpriseInspectionsDO != null && enterpriseInspectionsDO.size() > 0) { |
|
|
|
|
item.setInspectionsId(enterpriseInspectionsDO.get(0).getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//发布部门,
|
|
|
|
|
final Long userId = Long.valueOf(item.getCreator()); |
|
|
|
|
|
