新增单个任务派送，缺少报功模式

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java

@@ -3,6 +3,7 @@ package com.ruoyi.oa.controller;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.oa.domain.SysOaTask;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -42,11 +43,27 @@ public class SysOaTaskController extends BaseController {
     /**
      * 查询任务管理列表
      */
-    @SaCheckPermission("oa:task:list")
     @GetMapping("/list")
     public TableDataInfo<SysOaTaskVo> list(SysOaTaskBo bo, PageQuery pageQuery) {
         return iSysOaTaskService.queryPageList(bo, pageQuery);
     }
+    /**
+     * 查询任务管理列表
+     */
+    @GetMapping("/list-own-create")
+    public TableDataInfo<SysOaTaskVo> listOwnCreate(SysOaTaskBo bo, PageQuery pageQuery) {
+        bo.setCreateUserId(LoginHelper.getUserId());
+        return iSysOaTaskService.queryPageListOwn(bo, pageQuery);
+    }
+
+  /**
+     * 查询任务管理列表
+     */
+    @GetMapping("/list-own-work")
+    public TableDataInfo<SysOaTaskVo> listOwnWork(SysOaTaskBo bo, PageQuery pageQuery) {
+        bo.setWorkerId(LoginHelper.getUserId());
+        return iSysOaTaskService.queryPageListOwn(bo, pageQuery);
+    }
 
     /**
      * 根据工作类型字典查询任务列表
@@ -64,7 +81,6 @@ public class SysOaTaskController extends BaseController {
      * @param bo
      * @return
      */
-    @SaCheckPermission("oa:task:list")
     @GetMapping("/listByType")
     public List<SysOaTaskVo> listByType(SysOaTaskBo bo){
         return iSysOaTaskService.queryListByType(bo);
@@ -73,7 +89,6 @@ public class SysOaTaskController extends BaseController {
     /**
      * 导出任务管理列表
      */
-    @SaCheckPermission("oa:task:export")
     @Log(title = "任务管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SysOaTaskBo bo, HttpServletResponse response) {
@@ -86,7 +101,6 @@ public class SysOaTaskController extends BaseController {
      *
      * @param taskId 主键
      */
-    @SaCheckPermission("oa:task:query")
     @GetMapping("/{taskId}")
     public R<SysOaTaskVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long taskId) {
         return R.ok(iSysOaTaskService.queryById(taskId));
@@ -95,7 +109,6 @@ public class SysOaTaskController extends BaseController {
     /**
      * 新增任务管理
      */
-    @SaCheckPermission("oa:task:add")
     @Log(title = "任务管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -106,7 +119,6 @@ public class SysOaTaskController extends BaseController {
     /**
      * 修改任务管理
      */
-    @SaCheckPermission("oa:task:edit")
     @Log(title = "任务管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -114,12 +126,33 @@ public class SysOaTaskController extends BaseController {
         return toAjax(iSysOaTaskService.updateByBo(bo));
     }
 
+
+    /**
+     * 修改任务管理
+     */
+    @Log(title = "任务管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/postpone")
+    public R<Void> postponeTask(@Validated(EditGroup.class) @RequestBody SysOaTaskBo bo) {
+        return toAjax(iSysOaTaskService.postponeTask(bo));
+    }
+
+    /**
+     * 修改任务管理
+     */
+    @Log(title = "任务管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/postponeSuccess")
+    public R<Void> postponeSuccess(@Validated(EditGroup.class) @RequestBody SysOaTaskBo bo) {
+        return toAjax(iSysOaTaskService.postponeSuccess(bo));
+    }
+
+
     /**
      * 删除任务管理
      *
      * @param taskIds 主键串
      */
-    @SaCheckPermission("oa:task:remove")
     @Log(title = "任务管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{taskIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskUserController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.oa.controller;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
-import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
-import com.ruoyi.oa.service.ISysOaTaskUserService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 任务工人
- *
- * @author hdka
- * @date 2024-11-09
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/system/oaTaskUser")
-public class SysOaTaskUserController extends BaseController {
-
-    private final ISysOaTaskUserService iSysOaTaskUserService;
-
-    /**
-     * 查询任务工人列表
-     */
-    @SaCheckPermission("system:oaTaskUser:list")
-    @GetMapping("/list")
-    public TableDataInfo<SysOaTaskUserVo> list(SysOaTaskUserBo bo, PageQuery pageQuery) {
-        return iSysOaTaskUserService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出任务工人列表
-     */
-    @SaCheckPermission("system:oaTaskUser:export")
-    @Log(title = "任务工人", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(SysOaTaskUserBo bo, HttpServletResponse response) {
-        List<SysOaTaskUserVo> list = iSysOaTaskUserService.queryList(bo);
-        ExcelUtil.exportExcel(list, "任务工人", SysOaTaskUserVo.class, response);
-    }
-
-    /**
-     * 获取任务工人详细信息
-     *
-     * @param taskId 主键
-     */
-    @SaCheckPermission("system:oaTaskUser:query")
-    @GetMapping("/{taskId}")
-    public R<SysOaTaskUserVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long taskId) {
-        return R.ok(iSysOaTaskUserService.queryById(taskId));
-    }
-
-    /**
-     * 新增任务工人
-     */
-    @SaCheckPermission("system:oaTaskUser:add")
-    @Log(title = "任务工人", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaTaskUserBo bo) {
-        return toAjax(iSysOaTaskUserService.insertByBo(bo));
-    }
-
-    /**
-     * 修改任务工人
-     */
-    @SaCheckPermission("system:oaTaskUser:edit")
-    @Log(title = "任务工人", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaTaskUserBo bo) {
-        return toAjax(iSysOaTaskUserService.updateByBo(bo));
-    }
-
-    /**
-     * 删除任务工人
-     *
-     * @param taskIds 主键串
-     */
-    @SaCheckPermission("system:oaTaskUser:remove")
-    @Log(title = "任务工人", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{taskIds}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] taskIds) {
-        return toAjax(iSysOaTaskUserService.deleteWithValidByIds(Arrays.asList(taskIds), true));
-    }
-}