From 354cc1c2c7ff69c1183d77f1761a71d1ad5669da Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 30 九月 2025 10:46:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java index d9d0ebe..9992ae7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java @@ -2,9 +2,14 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.BasePage; +import com.ruoyi.system.dto.TMissionUserDto; import com.ruoyi.system.model.TMission; import com.ruoyi.system.query.TMissionQuery; +import com.ruoyi.system.vo.MissionTotalVo; +import com.ruoyi.system.vo.TMissionReassignVO; import com.ruoyi.system.vo.TMissionVO; +import com.ruoyi.system.vo.TotalHistoryVo; /** * <p> @@ -22,4 +27,39 @@ * @return */ PageInfo<TMissionVO> pageList(TMissionQuery query); + + MissionTotalVo missionTotal(String userId); + + String grabMission(String missionId, String userId); + + + PageInfo<TMission> pageNowList(BasePage query,String userId); + + PageInfo<TMission> pageGrabList(BasePage query); + + + PageInfo<TMission> pageHistoryList(BasePage query, String userId); + + + PageInfo<TMissionVO> pageListAssigned(TMissionQuery query); + + /** + * 待改派审核分页列表 + * @param query + * @return + */ + PageInfo<TMissionReassignVO> pageListReassignAudit(TMissionQuery query); + + /** + * 抢单任务池分页列表 + * @param query + * @return + */ + PageInfo<TMissionVO> pageListMissionPool(TMissionQuery query); + + TotalHistoryVo totalHistory(String userId); + + + void successMission(TMissionUserDto dto); + } -- Gitblit v1.7.1