From 60a470582d8ddf5d45441d6f73bdac235ecfc40f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 21 二月 2023 09:41:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/sys/ReportMapper.java | 6 ++++--
src/main/resources/mapper/sys/ReportMapper.xml | 6 ++++++
src/main/java/com/lf/server/controller/data/DataCountController.java | 10 ++++++----
data/update.sql | 3 ++-
src/main/java/com/lf/server/controller/sys/ReportController.java | 4 ++--
src/main/java/com/lf/server/service/sys/ReportService.java | 8 ++++----
6 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index 860b6d4..7c79a90 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -216,7 +216,8 @@
select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a where a.dircode like (select code from lf.sys_dir where name='瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116DT02锛�') || '%';
-select * from lf.sys_report order by id
+select * from lf.sys_report order by code
+select * from lf.sys_layer
diff --git a/src/main/java/com/lf/server/controller/data/DataCountController.java b/src/main/java/com/lf/server/controller/data/DataCountController.java
index 9a51d39..2de4bb1 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -1,6 +1,7 @@
package com.lf.server.controller.data;
import com.lf.server.annotation.SysLog;
+import com.lf.server.controller.all.BaseController;
import com.lf.server.controller.all.BaseQueryController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.CountEntity;
@@ -28,7 +29,7 @@
@Api(tags = "鏁版嵁绠＄悊\\鏁版嵁缁熻")
@RestController
@RequestMapping("/dataCount")
-public class DataCountController extends BaseQueryController {
+public class DataCountController extends BaseController {
@Autowired
ReportService reportService;
@@ -42,22 +43,23 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "code", value = "缂栫爜", dataType = "String", paramType = "query", example = "countOperates"),
@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<ReportEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<ReportEntity>> selectByPageAndCount(String name, String code, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = reportService.selectCount(name);
+ int count = reportService.selectCount(name, code);
if (count == 0) {
return success(0, null);
}
- List<ReportEntity> rs = reportService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+ List<ReportEntity> rs = reportService.selectByPage(name, code, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/sys/ReportController.java b/src/main/java/com/lf/server/controller/sys/ReportController.java
index a854cc9..52cefed 100644
--- a/src/main/java/com/lf/server/controller/sys/ReportController.java
+++ b/src/main/java/com/lf/server/controller/sys/ReportController.java
@@ -53,12 +53,12 @@
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = reportService.selectCount(name);
+ int count = reportService.selectCount(name, null);
if (count == 0) {
return success(0, null);
}
- List<ReportEntity> rs = reportService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+ List<ReportEntity> rs = reportService.selectByPage(name, null, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
index d8dadf3..3b03c0a 100644
--- a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
@@ -18,19 +18,21 @@
* 鏌ヨ璁板綍鏁�
*
* @param name 鍚嶇О
+ * @param code 缂栫爜
* @return 璁板綍鏁�
*/
- public Integer selectCount(String name);
+ public Integer selectCount(String name, String code);
/**
* 鍒嗛〉鏌ヨ
*
* @param name 鍚嶇О
+ * @param code 缂栫爜
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<ReportEntity> selectByPage(String name, Integer limit, Integer offset);
+ public List<ReportEntity> selectByPage(String name, String code, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index 9523a91..faae9ad 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -35,17 +35,17 @@
DownloadService downloadService;
@Override
- public Integer selectCount(String name) {
+ public Integer selectCount(String name, String code) {
name = StringHelper.getLikeStr(name);
- return reportMapper.selectCount(name);
+ return reportMapper.selectCount(name, code);
}
@Override
- public List<ReportEntity> selectByPage(String name, Integer limit, Integer offset) {
+ public List<ReportEntity> selectByPage(String name, String code, Integer limit, Integer offset) {
name = StringHelper.getLikeStr(name);
- return reportMapper.selectByPage(name, limit, offset);
+ return reportMapper.selectByPage(name, code, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 611333b..005a791 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -7,6 +7,9 @@
<if test="name != null">
name like #{name}
</if>
+ <if test="code != null">
+ code = #{code}
+ </if>
</where>
</select>
@@ -16,6 +19,9 @@
<if test="name != null">
name like #{name}
</if>
+ <if test="code != null">
+ code = #{code}
+ </if>
</where>
order by a.id desc
limit #{limit} offset #{offset}
--
Gitblit v1.9.3