sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

农场 任务列表 根据projectId显示任务所在日期

Browse Source
This commit is contained in:
WIN-IDGBLFHC1K6\Administrator
2022-06-28 15:29:46 +08:00
parent cd55670218
commit 4011874184
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/TaskController.java
+2 -2
View File
@@ -148,7 +148,7 @@ public class TaskController {
@GetMapping("/whatDayHaveTask")
@ApiOperation("有任务的日期")
public R<List<Map<String, String>>> whatDayHaveTask(){
return R.success(taskService.whatDayHaveTask());
public R<List<Map<String, String>>> whatDayHaveTask(@RequestParam(value = "projectId", required = false) Long projectId){
return R.success(taskService.whatDayHaveTask(projectId));
}
}
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskService.java
+1 -1
View File
@@ -97,6 +97,6 @@ public interface TaskService {
/**
* 小程序任务 有日期的任务显示
**/
List<Map<String, String>> whatDayHaveTask();
List<Map<String, String>> whatDayHaveTask(Long projectId);
}
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java
+6 -2
View File
@@ -478,13 +478,17 @@ public class TaskServiceImpl implements TaskService {
}
public List<Map<String, String>> whatDayHaveTask(){
public List<Map<String, String>> whatDayHaveTask(Long projectId){
LambdaQueryWrapperX<TaskDO> queryWrapperX = new LambdaQueryWrapperX<>();
queryWrapperX.ne(TaskDO::getDraft, true);
queryWrapperX.ne(TaskDO::getPretendDelete, true);
queryWrapperX.eqIfPresent(TaskDO::getProjectId, projectId);
List<TaskDO> taskList = taskMapper.selectList(queryWrapperX);
Map<Object, List<TaskDO>> dateMap = taskList.stream().collect(Collectors.groupingBy(item -> DateUtil.format(item.getPlanStartTime(), DatePattern.NORM_DATE_FORMAT)));
List<Map<String, String>> list = new ArrayList<>();
if (ObjectUtil.isEmpty(taskList)){
return list;
}
Map<Object, List<TaskDO>> dateMap = taskList.stream().collect(Collectors.groupingBy(item -> DateUtil.format(item.getPlanStartTime(), DatePattern.NORM_DATE_FORMAT)));
dateMap.entrySet().stream().forEach(item ->{
Map map = new HashMap<String,String>() ;
map.put("date", item.getKey().toString());