From c8e5656bd1d02f66b9e6e159da56804f7c7da112 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 09:28:50 +0800
Subject: [PATCH] 12
---
src/main/java/com/lf/server/mapper/data/TaskMapper.java | 8 ++-
src/main/java/com/lf/server/service/data/TaskService.java | 8 ++--
src/main/java/com/lf/server/controller/data/TaskController.java | 58 ++---------------------------
src/main/resources/mapper/data/TaskMapper.xml | 12 +++++-
4 files changed, 23 insertions(+), 63 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 b7fdf81..9b1053d 100644
--- a/src/main/java/com/lf/server/controller/data/TaskController.java
+++ b/src/main/java/com/lf/server/controller/data/TaskController.java
@@ -39,78 +39,28 @@
PublishService publishService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name) {
- try {
- int count = taskService.selectCount(name);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", 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 = "/selectByPage")
- public ResponseMsg<List<TaskEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- List<TaskEntity> rs = taskService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "status", value = "浠诲姟鐘舵��", dataType = "Integer", paramType = "query", example = "1"),
@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 pageSize, Integer pageIndex) {
+ public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = taskService.selectCount(name);
+ int count = taskService.selectCount(name, status);
if (count == 0) {
return success(0, null);
}
- List<TaskEntity> rs = taskService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+ List<TaskEntity> rs = taskService.selectByPage(name, status, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectAll")
- public ResponseMsg<List<TaskEntity>> selectAll() {
- try {
- List<TaskEntity> list = taskService.selectAll();
-
- return success(list);
} catch (Exception ex) {
return fail(ex, null);
}
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 945addc..e90188b 100644
--- a/src/main/java/com/lf/server/mapper/data/TaskMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/TaskMapper.java
@@ -16,20 +16,22 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param name 浠诲姟鍚嶇О
+ * @param name 浠诲姟鍚嶇О
+ * @param status 浠诲姟鐘舵��
* @return 璁板綍鏁�
*/
- public Integer selectCount(String name);
+ public Integer selectCount(String name, Integer status);
/**
* 鍒嗛〉鏌ヨ
*
* @param name 浠诲姟鍚嶇О
+ * @param status 浠诲姟鐘舵��
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<TaskEntity> selectByPage(String name, Integer limit, Integer offset);
+ public List<TaskEntity> selectByPage(String name, Integer status, 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 a73473c..f1187f7 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) {
+ public Integer selectCount(String name, Integer status) {
name = StringHelper.getLikeUpperStr(name);
- return taskMapper.selectCount(name);
+ return taskMapper.selectCount(name, status);
}
@Override
- public List<TaskEntity> selectByPage(String name, Integer limit, Integer offset) {
+ public List<TaskEntity> selectByPage(String name, Integer status, Integer limit, Integer offset) {
name = StringHelper.getLikeUpperStr(name);
- return taskMapper.selectByPage(name, limit, offset);
+ return taskMapper.selectByPage(name, status, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/TaskMapper.xml b/src/main/resources/mapper/data/TaskMapper.xml
index 1b9d8c8..3b69c8b 100644
--- a/src/main/resources/mapper/data/TaskMapper.xml
+++ b/src/main/resources/mapper/data/TaskMapper.xml
@@ -4,8 +4,12 @@
<select id="selectCount" resultType="java.lang.Integer">
select count(*) from lf.sys_task
<where>
+ 1 = 1
<if test="name != null">
- upper(name) like #{name}
+ and upper(name) like #{name}
+ </if>
+ <if test="status != null">
+ and status = #{status}
</if>
</where>
</select>
@@ -14,8 +18,12 @@
select a.*, fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, fn_uname(create_user) createName, fn_uname(update_user) updateName
from lf.sys_task a
<where>
+ 1 = 1
<if test="name != null">
- upper(name) like #{name}
+ and upper(name) like #{name}
+ </if>
+ <if test="status != null">
+ and status = #{status}
</if>
</where>
order by a.update_time desc, a.create_time desc
--
Gitblit v1.9.3