区分收到任务和发布任务

inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java

@@ -36,9 +36,11 @@ public interface OADistributionMapper extends BaseMapper<OADistribution> {
     /*修改任务读取状态*/
     Integer changeStatus(@Param("taskId") String taskId,@Param("sysUserId") String sysUserId);
 
-    //发布任务列表
+    //查询我发布的任务
-    List<OADistribution> deliverTaskList(@Param("condition")String condition);
+    List<OADistribution> deliverTaskList(@Param("condition")String condition,
-
+                                         @Param("snedId")String snedId);
-
 
+    //查询我收到的任务
+    List<OADistribution> getTaskList(@Param("condition")String condition,
+                                     @Param("snedId")String snedId);
 }

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;
 

inventory-dao/src/main/resources/mapper/OADistributionMapper.xml

@@ -214,6 +214,26 @@
   <select id="deliverTaskList" resultType="com.rzyc.model.OADistribution">
     select  ob.* from OADistribution ob
     where ob.subject like #{condition}
+    and ob.sned_id = #{snedId}
+    order by ob.end_time asc
+  </select>
+
+  <!--<select id="getTaskList" resultType="com.rzyc.model.OADistribution">
+    select  ob.* from OADistribution ob
+    where ob.subject like #{condition}
+      and ob.SysUserId = #{snedId}
+    order by ob.end_time asc
+  </select>-->
+
+  <select id="getTaskList" resultType="com.rzyc.model.OADistribution">
+    select  ob.* from OADistribution ob
+    where 1=1
+    <if test="null != condition and condition != ''">
+      ob.subject like #{condition}
+    </if>
+    <if test="null != SysUserId and SysUserId != ''">
+      and ob.SysUserId = #{snedId}
+    </if>
     order by ob.end_time asc
   </select>
 

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<String> addTask(@Valid TaskAddOrUpdateDto addTaskDto) throws Exception{
         SingleResult<String> 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<OADistribution> deliverTaskList(){
+    public MultiResult<OADistribution> deliverTaskList(@Valid IdDto idDto){
         MultiResult<OADistribution> result = new MultiResult<>();
-        List<OADistribution> oaTasks = oaDistributionMapper.deliverTaskList("%%");
+        List<OADistribution> 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<OADistribution> getTaskList(@Valid IdDto idDto){
+        MultiResult<OADistribution> result = new MultiResult<>();
+        List<OADistribution> oaTasks = oaDistributionMapper.getTaskList("%%",idDto.getId());
+        return result;
+    }
+
     /**
     * @return: 查询任务
     * @Author: ZQW
     * @Date: 2022/9/20
     */
-    @ApiOperation(value = "查询任务")
+    @ApiOperation(value = "查询任务",position = 10)
     @GetMapping("taskList")
     public MultiResult<OATask> taskList(){
         MultiResult<OATask> 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<ThingVo> thingsList(@Valid IdDto idDto){
         MultiResult<ThingVo> 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<String> addTask(@Valid AddTaskDto addTaskDto) throws Exception{
          SingleResult<String> result = new SingleResult<>();