我的任务列表

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

@@ -34,5 +34,7 @@ public interface OADistributionMapper extends BaseMapper<OADistribution> {
     /*修改任务读取状态*/
     Integer changeStatus(@Param("taskId") String taskId,@Param("sysUserId") String sysUserId);
 
-    List<OADistribution> taskList(@Param("condition")String condition);
+    //发布任务列表
+    List<OADistribution> deliverTaskList(@Param("condition")String condition);
+
 }

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

@@ -101,4 +101,5 @@ public interface OATaskMapper  extends BaseMapper<OATask> {
     /*进行中事项*/
     Integer countConduct(@Param("listPerformId") String listPerformId);
 
+    List<OATask> taskList(@Param("condition") String condition);
 }

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

@@ -8,6 +8,7 @@
     <result column="SysChinaName" jdbcType="VARCHAR" property="syschinaname" />
     <result column="SysTelephone" jdbcType="VARCHAR" property="systelephone" />
     <result column="AppStatus" jdbcType="VARCHAR" property="appstatus" />
+    <result column="AppStatus" jdbcType="VARCHAR" property="appstatus" />
     <result column="CreatedOn" jdbcType="TIMESTAMP" property="createdon" />
     <result column="CreatedBy" jdbcType="VARCHAR" property="createdby" />
     <result column="ModifiedOn" jdbcType="TIMESTAMP" property="modifiedon" />
@@ -209,4 +210,10 @@
     UPDATE OADistribution SET AppStatus = "已读" WHERE OATaskId = #{taskId}
     AND SysUserId = #{sysUserId}
   </update>
+
+  <select id="deliverTaskList" resultType="com.rzyc.model.OADistribution">
+    select  ob.* from OADistribution ob
+    where ob.subject like #{condition}
+    order by ob.end_time asc
+  </select>
 </mapper>

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

@@ -405,4 +405,9 @@
       AND lf.`ListPerformId` = #{listPerformId}
   </select>
 
+  <select id="taskList" resultMap="BaseResultMap">
+    select  ot.* from oatask ot
+    where ot.TaskType like #{condition}
+    order by ot.EndDate asc
+  </select>
 </mapper>

inventory-gov/pom.xml

@@ -97,6 +97,12 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.9.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.6</version>
+        </dependency>
         <!-- swagger end -->
 
         <!-- 参数验证 start -->

inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java

@@ -1,6 +1,7 @@
 package com.rzyc.advice;
 
 
+import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -23,6 +24,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
+@EnableSwaggerBootstrapUI
 public class Swagger2Config {
 
     /**

inventory-gov/src/main/java/com/rzyc/controller/TaskController.java

@@ -5,6 +5,7 @@ import com.common.utils.StringUtils;
 import com.common.utils.model.MultiResult;
 import com.common.utils.model.SingleResult;
 import com.rzyc.model.OADistribution;
+import com.rzyc.model.OATask;
 import com.rzyc.model.task.dto.AddTaskDto;
 import com.rzyc.model.task.vo.OADistributionVo;
 import com.rzyc.model.user.SysUser;
@@ -14,10 +15,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.DateConverter;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.Date;
@@ -38,11 +36,11 @@ import java.util.List;
 public class TaskController extends BaseController{
     
     /**
-    * @return: 新增任务
+    * @return: 新增任务追踪
     * @Author: ZQW
     * @Date: 2022/9/20
     */
-    @ApiOperation(value = "新增任务")
+    @ApiOperation(value = "新增任务追踪")
     @PostMapping()
     public SingleResult<String> addTask(@Valid AddTaskDto addTaskDto) throws Exception{
         SingleResult<String> result = new SingleResult<>();
@@ -75,9 +73,26 @@ public class TaskController extends BaseController{
      * @Author: ZQW
      * @Date: 2022/9/20
      */
-    public MultiResult<OADistributionVo> taskList(){
+    @ApiOperation(value = "我发布的任务")
-        MultiResult<OADistributionVo> result = new MultiResult<>();
+    @GetMapping("deliverTaskList")
-        List<OADistribution> oaDistributions = oaDistributionMapper.taskList("%%");
+    public MultiResult<OADistribution> deliverTaskList(){
+        MultiResult<OADistribution> result = new MultiResult<>();
+        List<OADistribution> oaTasks = oaDistributionMapper.deliverTaskList("%%");
+        result.setData(oaTasks);
+        return result;
+    }
+
+    /**
+    * @return: 查询任务
+    * @Author: ZQW
+    * @Date: 2022/9/20
+    */
+    @ApiOperation(value = "查询任务")
+    @GetMapping("taskList")
+    public MultiResult<OATask> taskList(){
+        MultiResult<OATask> result = new MultiResult<>();
+        List<OATask> oaTasks = oaTaskMapper.taskList("%%");
+        result.setData(oaTasks);
         return result;
     }
 }