From 74fa381e76019ff85fe40e59da1ec72faf0e64f5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 09:53:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/data/TaskMapper.java | 6 ++++--
src/main/java/com/lf/server/service/data/TaskService.java | 8 ++++----
src/main/java/com/lf/server/controller/data/TaskController.java | 11 ++++++-----
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/TaskController.java b/src/main/java/com/lf/server/controller/data/TaskController.java
index 9b1053d..aa486c9 100644
--- a/src/main/java/com/lf/server/controller/data/TaskController.java
+++ b/src/main/java/com/lf/server/controller/data/TaskController.java
@@ -43,22 +43,23 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "status", value = "浠诲姟鐘舵��", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "type", value = "浠诲姟绫诲埆", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, String type, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = taskService.selectCount(name, status);
+ int count = taskService.selectCount(name, status, type);
if (count == 0) {
return success(0, null);
}
- List<TaskEntity> rs = taskService.selectByPage(name, status, pageSize, pageSize * (pageIndex - 1));
+ List<TaskEntity> rs = taskService.selectByPage(name, status, type, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -171,8 +172,8 @@
public ResponseMsg<Object> deleteTask(int id, HttpServletRequest req) {
try {
TaskEntity task = taskService.selectById(id);
- if (null == task) {
- return fail("浠诲姟涓嶅瓨鍦�", -1);
+ if (null == task || 1 != task.getStatus()) {
+ return fail("浠诲姟涓嶅瓨鍦ㄦ垨鏃犻渶缁撴潫", -1);
}
List<Integer> ids = new ArrayList<>();
diff --git a/src/main/java/com/lf/server/mapper/data/TaskMapper.java b/src/main/java/com/lf/server/mapper/data/TaskMapper.java
index e90188b..5856163 100644
--- a/src/main/java/com/lf/server/mapper/data/TaskMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/TaskMapper.java
@@ -18,20 +18,22 @@
*
* @param name 浠诲姟鍚嶇О
* @param status 浠诲姟鐘舵��
+ * @param type 浠诲姟绫诲埆
* @return 璁板綍鏁�
*/
- public Integer selectCount(String name, Integer status);
+ public Integer selectCount(String name, Integer status, String type);
/**
* 鍒嗛〉鏌ヨ
*
* @param name 浠诲姟鍚嶇О
* @param status 浠诲姟鐘舵��
+ * @param type 浠诲姟绫诲埆
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<TaskEntity> selectByPage(String name, Integer status, Integer limit, Integer offset);
+ public List<TaskEntity> selectByPage(String name, Integer status, String type, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/lf/server/service/data/TaskService.java b/src/main/java/com/lf/server/service/data/TaskService.java
index f1187f7..d1821c3 100644
--- a/src/main/java/com/lf/server/service/data/TaskService.java
+++ b/src/main/java/com/lf/server/service/data/TaskService.java
@@ -18,17 +18,17 @@
TaskMapper taskMapper;
@Override
- public Integer selectCount(String name, Integer status) {
+ public Integer selectCount(String name, Integer status, String type) {
name = StringHelper.getLikeUpperStr(name);
- return taskMapper.selectCount(name, status);
+ return taskMapper.selectCount(name, status, type);
}
@Override
- public List<TaskEntity> selectByPage(String name, Integer status, Integer limit, Integer offset) {
+ public List<TaskEntity> selectByPage(String name, Integer status, String type, Integer limit, Integer offset) {
name = StringHelper.getLikeUpperStr(name);
- return taskMapper.selectByPage(name, status, limit, offset);
+ return taskMapper.selectByPage(name, status, type, limit, offset);
}
@Override
--
Gitblit v1.9.3