From 8e860011382c0e234a92ab8d8851895d58552100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=BB=8D=E6=98=A5?= <13768722834@163.com> Date: Fri, 13 Jun 2025 18:08:09 +0800 Subject: [PATCH] temp --- .../bst/calendarTask/domain/CalendarTask.java | 2 ++ .../domain/CalendarTaskQuery.java | 3 ++ .../calendarTask/domain/CalendarTaskVO.java | 3 ++ .../service/CalendarTaskService.java | 4 ++- .../service/impl/CalendarTaskImpl.java | 5 +++ .../com/ruoyi/bst/task/mapper/TaskMapper.java | 6 ++++ .../com/ruoyi/bst/task/mapper/TaskMapper.xml | 34 +++++++++++++++---- .../ruoyi/web/bst/CalendarTaskController.java | 12 +++++++ 8 files changed, 61 insertions(+), 8 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java index 83729e5..b3ea0c3 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTask.java @@ -22,4 +22,6 @@ public class CalendarTask extends BaseEntity @ApiModelProperty("bug总数") private Integer bug; + + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java index 87970f1..6a6fccd 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskQuery.java @@ -8,4 +8,7 @@ public class CalendarTaskQuery extends CalendarTaskVO { // 用户id private Long userId; + // 多个用户id + private Long[] userIds; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java index 1f2797c..98557b4 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/domain/CalendarTaskVO.java @@ -8,4 +8,7 @@ public class CalendarTaskVO extends CalendarTask { // 数据所在的日期 private String taskDate; + // 当前日期有多少个任务 + private String taskCount; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java index 5728916..40e3c4d 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/CalendarTaskService.java @@ -1,12 +1,13 @@ package com.ruoyi.bst.calendarTask.service; +import com.ruoyi.bst.calendarTask.domain.CalendarTaskQuery; import com.ruoyi.bst.calendarTask.domain.CalendarTaskVO; import java.util.List; import java.util.Map; /** - * 首页日历任务 + * 日历任务 */ public interface CalendarTaskService { @@ -16,6 +17,7 @@ public interface CalendarTaskService { */ List getTaskNumber(); + List getTaskNumberByIds(CalendarTaskQuery query); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java index e3d43e2..297ce8c 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/calendarTask/service/impl/CalendarTaskImpl.java @@ -28,4 +28,9 @@ public class CalendarTaskImpl implements CalendarTaskService { List calendarTaskVOS = taskMapper.selectCalendarTask(calendarTaskQuery); return calendarTaskVOS; } + + @Override + public List getTaskNumberByIds(CalendarTaskQuery query) { + return taskMapper.selectCalendarTaskByIds(query); + } } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java index 0df5315..63c514c 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.java @@ -112,6 +112,12 @@ public interface TaskMapper List selectCalendarTask(@Param("query")CalendarTaskQuery query); + /** + * 获取日历任务总数量 + * @param query + * @return 结果 + */ + List selectCalendarTaskByIds(@Param("query")CalendarTaskQuery query); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml index 715c181..67bbd79 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml @@ -264,18 +264,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java index 1bd6804..0a4f8be 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/CalendarTaskController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.bst; +import com.ruoyi.bst.calendarTask.domain.CalendarTaskQuery; import com.ruoyi.bst.calendarTask.domain.CalendarTaskVO; import com.ruoyi.bst.calendarTask.service.CalendarTaskService; import com.ruoyi.bst.task.domain.TaskQuery; @@ -39,4 +40,15 @@ public class CalendarTaskController extends BaseController { return success(taskNumber); } + /** + * 任务添加/修改模块，负责人任务分布情况 + * @param query + * @return + */ + @GetMapping("/listSum") + public AjaxResult getCalendarTaskByUserIds(CalendarTaskQuery query) { + List taskNumberByIds = calendarTaskService.getTaskNumberByIds(query); + return success(taskNumberByIds); + } + }