From e72f0ff6bd9a1841b420e534237faf0fbf1f2fc5 Mon Sep 17 00:00:00 2001 From: zhengqiaowen <1275811465@qq.com> Date: Fri, 23 Sep 2022 09:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rzyc/mapper/OADistributionMapper.java | 4 ++- .../java/com/rzyc/mapper/OATaskMapper.java | 1 + .../resources/mapper/OADistributionMapper.xml | 7 ++++ .../main/resources/mapper/OATaskMapper.xml | 5 +++ inventory-gov/pom.xml | 6 ++++ .../java/com/rzyc/advice/Swagger2Config.java | 2 ++ .../com/rzyc/controller/TaskController.java | 33 ++++++++++++++----- 7 files changed, 48 insertions(+), 10 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 47c7365..919ee50 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java @@ -34,5 +34,7 @@ public interface OADistributionMapper extends BaseMapper { /*修改任务读取状态*/ Integer changeStatus(@Param("taskId") String taskId,@Param("sysUserId") String sysUserId); - List taskList(@Param("condition")String condition); + //发布任务列表 + List deliverTaskList(@Param("condition")String condition); + } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java index 131431d..6c013fd 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java @@ -101,4 +101,5 @@ public interface OATaskMapper extends BaseMapper { /*进行中事项*/ Integer countConduct(@Param("listPerformId") String listPerformId); + List taskList(@Param("condition") String condition); } diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml index 24dfd5c..6ba3794 100644 --- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml @@ -8,6 +8,7 @@ + @@ -209,4 +210,10 @@ UPDATE OADistribution SET AppStatus = "已读" WHERE OATaskId = #{taskId} AND SysUserId = #{sysUserId} + + diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml index 09905d5..b5ff4cc 100644 --- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml +++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml @@ -405,4 +405,9 @@ AND lf.`ListPerformId` = #{listPerformId} + diff --git a/inventory-gov/pom.xml b/inventory-gov/pom.xml index e06e86e..877af14 100644 --- a/inventory-gov/pom.xml +++ b/inventory-gov/pom.xml @@ -97,6 +97,12 @@ springfox-swagger-ui 2.9.2 + + + com.github.xiaoymin + swagger-bootstrap-ui + 1.9.6 + diff --git a/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java b/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java index 92c4c1d..c9baa1e 100644 --- a/inventory-gov/src/main/java/com/rzyc/advice/Swagger2Config.java +++ b/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 { /** 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 c17f14c..29aa3dc 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; 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 addTask(@Valid AddTaskDto addTaskDto) throws Exception{ SingleResult result = new SingleResult<>(); @@ -70,14 +68,31 @@ public class TaskController extends BaseController{ return result; } + /** + * @return: 查询任务 + * @Author: ZQW + * @Date: 2022/9/20 + */ + @ApiOperation(value = "我发布的任务") + @GetMapping("deliverTaskList") + public MultiResult deliverTaskList(){ + MultiResult result = new MultiResult<>(); + List oaTasks = oaDistributionMapper.deliverTaskList("%%"); + result.setData(oaTasks); + return result; + } + /** * @return: 查询任务 * @Author: ZQW * @Date: 2022/9/20 */ - public MultiResult taskList(){ - MultiResult result = new MultiResult<>(); - List oaDistributions = oaDistributionMapper.taskList("%%"); + @ApiOperation(value = "查询任务") + @GetMapping("taskList") + public MultiResult taskList(){ + MultiResult result = new MultiResult<>(); + List oaTasks = oaTaskMapper.taskList("%%"); + result.setData(oaTasks); return result; } }