From 0be3a1184a0331318fb322eb9f3ba6bce3f813b2 Mon Sep 17 00:00:00 2001 From: zhengqiaowen <1275811465@qq.com> Date: Mon, 26 Sep 2022 15:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=94=B6=E5=88=B0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=92=8C=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rzyc/mapper/OADistributionMapper.java | 10 +++-- .../model/task/dto/TaskAddOrUpdateDto.java | 4 +- .../resources/mapper/OADistributionMapper.xml | 20 ++++++++++ .../com/rzyc/controller/TaskController.java | 40 ++++++++++++++----- 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java index 375fa6f..a35c840 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java @@ -36,9 +36,11 @@ public interface OADistributionMapper extends BaseMapper { /*修改任务读取状态*/ Integer changeStatus(@Param("taskId") String taskId,@Param("sysUserId") String sysUserId); - //发布任务列表 - List deliverTaskList(@Param("condition")String condition); - - + //查询我发布的任务 + List deliverTaskList(@Param("condition")String condition, + @Param("snedId")String snedId); + //查询我收到的任务 + List getTaskList(@Param("condition")String condition, + @Param("snedId")String snedId); } diff --git a/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java b/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java index d430303..2f119a1 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/task/dto/TaskAddOrUpdateDto.java @@ -26,11 +26,11 @@ public class TaskAddOrUpdateDto { @TableField("OATaskId") private String oataskid; - @ApiModelProperty(value = "指派用户id") + @ApiModelProperty(value = "指派用户id",required = true) @TableField("sned_id") private String snedId; - @ApiModelProperty(value = "接收用户id") + @ApiModelProperty(value = "接收用户id",required = true) @TableField("SysUserId") private String sysuserid; diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml index a3971ad..1e4a3af 100644 --- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml @@ -214,6 +214,26 @@ + + + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java index 19184cd..ea30663 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java @@ -4,6 +4,7 @@ import com.common.utils.RandomNumber; import com.common.utils.StringUtils; import com.common.utils.model.MultiResult; import com.common.utils.model.SingleResult; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.rzyc.bean.task.dto.AddTaskDto; import com.rzyc.bean.task.dto.IdDto; import com.rzyc.bean.task.vo.ThingVo; @@ -12,6 +13,8 @@ import com.rzyc.model.OATask; import com.rzyc.model.task.dto.TaskAddOrUpdateDto; import com.rzyc.model.user.SysUser; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; @@ -38,11 +41,11 @@ import java.util.List; public class TaskController extends BaseController{ /** - * @return: 新增任务追踪 + * @return: 新增发布任务 * @Author: ZQW * @Date: 2022/9/20 */ - @ApiOperation(value = "新增发布任务") + @ApiOperation(value = "新增发布任务",position = 1) @PostMapping() public SingleResult addTask(@Valid TaskAddOrUpdateDto addTaskDto) throws Exception{ SingleResult result = new SingleResult<>(); @@ -79,21 +82,40 @@ public class TaskController extends BaseController{ * @Author: ZQW * @Date: 2022/9/20 */ - @ApiOperation(value = "我发布的任务") + @ApiOperation(value = "查询我发布的任务",position = 2) + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "id",value = "指派用户id") + }) @GetMapping("deliverTaskList") - public MultiResult deliverTaskList(){ + public MultiResult deliverTaskList(@Valid IdDto idDto){ MultiResult result = new MultiResult<>(); - List oaTasks = oaDistributionMapper.deliverTaskList("%%"); + List oaTasks = oaDistributionMapper.deliverTaskList("%%",idDto.getId()); result.setData(oaTasks); return result; } + /** + * @Description: 查询我收到的任务 + * @Author ZQW + * @CreateTime 2022/9/26 9:34 + */ + @ApiOperation(value = "查询我收到的任务",position = 3) + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "id",value = "接收用户id") + }) + @GetMapping("getTaskList") + public MultiResult getTaskList(@Valid IdDto idDto){ + MultiResult result = new MultiResult<>(); + List oaTasks = oaDistributionMapper.getTaskList("%%",idDto.getId()); + return result; + } + /** * @return: 查询任务 * @Author: ZQW * @Date: 2022/9/20 */ - @ApiOperation(value = "查询任务") + @ApiOperation(value = "查询任务",position = 10) @GetMapping("taskList") public MultiResult taskList(){ MultiResult result = new MultiResult<>(); @@ -107,7 +129,7 @@ public class TaskController extends BaseController{ * @Author ZQW * @CreateTime 2022/9/23 10:20 */ - @ApiOperation(value = "待办事项列表") + @ApiOperation(value = "待办事项列表",position = 11) @GetMapping("thingsList") public MultiResult thingsList(@Valid IdDto idDto){ MultiResult result = new MultiResult<>(); @@ -117,11 +139,11 @@ public class TaskController extends BaseController{ } /** - * @Description: 新增任务 + * @Description: 新增任务任务执行进度 * @Author ZQW * @CreateTime 2022/9/23 14:38 */ - @ApiOperation(value = "新增任务") + @ApiOperation(value = "新增任务任务执行进度",position = 12) @PostMapping("addTask") public SingleResult addTask(@Valid AddTaskDto addTaskDto) throws Exception{ SingleResult result = new SingleResult<>();