资源服务代码修改提交

ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueDto.java

@@ -61,4 +61,6 @@ public class ClueDto implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    private Long taskId;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -142,8 +142,8 @@ public class OrganizeServiceImpl implements OrganizeService {
         Sort sort = Sort.by(Sort.Direction.ASC, "createTime");
         HashMap<String, Object> hashMap = new HashMap<>();
         List<List<OrganizeDto>> organizeDtoList = new ArrayList<>();
-//        Long userId = SecurityUtils.getCurrentUserId();
+        Long userId = SecurityUtils.getCurrentUserId();
-        Long userId = 5L;
+//        Long userId = 5L;
         OrganizeUserQueryCriteria organizeUserQueryCriteria = new OrganizeUserQueryCriteria();
         organizeUserQueryCriteria.setUserId(userId);
         Page<OrganizeUser> organizeUserRepositoryAll = organizeUserRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, organizeUserQueryCriteria, criteriaBuilder), pageable);
@@ -154,7 +154,6 @@ public class OrganizeServiceImpl implements OrganizeService {
                     organizeQueryCriteria.setId(organizeUserDto.getOrganizeId());
                     // 查询组长的组
                     List<OrganizeDto> organizeDtos = organizeMapper.toDto(organizeRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, organizeQueryCriteria, criteriaBuilder),sort));
-                    //查询小组的进度
                     if (organizeDtos.size() > 0) {
                         organizeDtoList.add(organizeDtos);
                     }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java

@@ -9,7 +9,6 @@ import com.baiye.modules.system.domain.Task;
 import com.baiye.modules.system.repository.OrganizeRepository;
 import com.baiye.modules.system.repository.OrganizeUserRepository;
 import com.baiye.modules.system.repository.TaskRepository;
-import com.baiye.modules.system.service.OrganizeService;
 import com.baiye.modules.system.service.TaskService;
 import com.baiye.modules.system.service.UserService;
 import com.baiye.modules.system.service.dto.TaskDto;
@@ -27,7 +26,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,20 +51,12 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     public Object queryAll(TaskQueryCriteria taskQueryCriteria, Pageable pageable) {
-        Sort sort = Sort.by(Sort.Direction.ASC, "createTime");
         Long userId = SecurityUtils.getCurrentUserId();
         taskQueryCriteria.setCreateBy(userId);
         Page<Task> taskRepositoryAll = taskRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, taskQueryCriteria, criteriaBuilder), pageable);
         Page<TaskDto> map = taskRepositoryAll.map(taskMapper::toDto);
         for (TaskDto taskDto : map) {
             selectOrganizeUser(taskDto);
-//            List<Organize> organizeList = organizeRepository.findByTaskId(taskDto.getId());
-//            for (Organize organize : organizeList) {
-//                List<UserDto> userDtoList = selectOrganizeUser(organize.getId());
-//                organize.setUserList(userDtoList);
-//            }
-//            taskDto.setOrganizeList(organizeList);
-
         }
         return PageUtil.toPage(map);
     }
@@ -79,14 +69,8 @@ public class TaskServiceImpl implements TaskService {
         Sort sort = Sort.by(Sort.Direction.ASC, "createTime");
         List<TaskDto> taskDtos = taskMapper.toDto(taskRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, taskQueryCriteria, criteriaBuilder),sort));
         for (TaskDto taskDto : taskDtos) {
-//            //任务下的小组信息加入
+            //任务下的小组信息加入
             selectOrganizeUser(taskDto);
-//            List<Organize> organizeList = organizeRepository.findByTaskId(taskDto.getId());
-//            for (Organize organize : organizeList) {
-//                List<UserDto> userDtoList = selectOrganizeUser(organize.getId());
-//                organize.setUserList(userDtoList);
-//            }
-//            taskDto.setOrganizeList(organizeList);
         }
         return taskDtos;
     }

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -1,6 +1,7 @@
 package com.baiye.module.service.impl;
 
 import com.baiye.constant.DefaultNumberConstants;
+import com.baiye.model.dto.ClueDto;
 import com.baiye.model.dto.ClueQueryCriteria;
 import com.baiye.model.dto.DistributeResponseDTO;
 import com.baiye.module.dao.ClueRecordRepository;
@@ -98,6 +99,11 @@ public class ClueServiceImpl implements ClueService {
         Sort sort = Sort.by(Sort.Direction.ASC, "createTime");
         Pageable pageable = PageRequest.of(clueQueryCriteria.getPage(), clueQueryCriteria.getSize(),sort);
         Page<Clue> cluePage = clueRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, clueQueryCriteria, criteriaBuilder), pageable);
-        return PageUtil.toPage(cluePage.map(clueMapper::toDto));
+        Page<ClueDto> map = cluePage.map(clueMapper::toDto);
+        for (ClueDto clueDto : map) {
+            ClueRecord clueRecord = clueRecordRepository.findById(clueDto.getRecordId()).orElseGet(ClueRecord::new);
+            clueDto.setTaskId(clueRecord.getTaskId());
+        }
+        return PageUtil.toPage(map);
     }
 }