From fb606613ae68e1bd857366576c6a1d85a57c7c74 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 25 十一月 2022 16:34:38 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DomainController.java | 8 ++++----
src/main/java/com/lf/server/mapper/data/DomainMapper.java | 8 ++++----
src/main/resources/mapper/data/DomainMapper.xml | 8 ++++----
src/main/java/com/lf/server/service/data/DomainService.java | 12 ++++++------
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DomainController.java b/src/main/java/com/lf/server/controller/data/DomainController.java
index dc65167..b39e9e7 100644
--- a/src/main/java/com/lf/server/controller/data/DomainController.java
+++ b/src/main/java/com/lf/server/controller/data/DomainController.java
@@ -84,23 +84,23 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
@ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "b_hy20w_s23"),
- @ApiImplicitParam(name = "code", value = "缂栫爜", dataType = "String", paramType = "query", example = "1"),
+ @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 = "/selectByPageAndCount")
- public ResponseMsg<List<DomainEntity>> selectByPageAndCount(String ns, String tab, String code, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<DomainEntity>> selectByPageAndCount(String ns, String tab, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = domainService.selectCount(ns, tab, code);
+ int count = domainService.selectCount(ns, tab, name);
if (count == 0) {
return success(0, null);
}
- List<DomainEntity> rs = domainService.selectByPage(ns, tab, code, pageSize, pageSize * (pageIndex - 1));
+ List<DomainEntity> rs = domainService.selectByPage(ns, tab, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/mapper/data/DomainMapper.java b/src/main/java/com/lf/server/mapper/data/DomainMapper.java
index 47acc89..7436762 100644
--- a/src/main/java/com/lf/server/mapper/data/DomainMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DomainMapper.java
@@ -19,22 +19,22 @@
*
* @param ns 鍚嶇О绌洪棿
* @param tab 琛ㄥ悕
- * @param code 缂栫爜
+ * @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCount(String ns, String tab, String code);
+ public Integer selectCount(String ns, String tab, String name);
/**
* 鍒嗛〉鏌ヨ
*
* @param ns 鍚嶇О绌洪棿
* @param tab 琛ㄥ悕
- * @param code 缂栫爜
+ * @param name 鍚嶇О
* @param limit 璁板綍琛�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<DomainEntity> selectByPage(String ns, String tab, String code, Integer limit, Integer offset);
+ public List<DomainEntity> selectByPage(String ns, String tab, String name, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/lf/server/service/data/DomainService.java b/src/main/java/com/lf/server/service/data/DomainService.java
index 08e4369..0957c90 100644
--- a/src/main/java/com/lf/server/service/data/DomainService.java
+++ b/src/main/java/com/lf/server/service/data/DomainService.java
@@ -19,17 +19,17 @@
DomainMapper domainMapper;
@Override
- public Integer selectCount(String ns, String tab, String code) {
- code = StringHelper.getLikeStr(code);
+ public Integer selectCount(String ns, String tab, String name) {
+ name = StringHelper.getLikeStr(name);
- return domainMapper.selectCount(ns, tab, code);
+ return domainMapper.selectCount(ns, tab, name);
}
@Override
- public List<DomainEntity> selectByPage(String ns, String tab, String code, Integer limit, Integer offset) {
- code = StringHelper.getLikeStr(code);
+ public List<DomainEntity> selectByPage(String ns, String tab, String name, Integer limit, Integer offset) {
+ name = StringHelper.getLikeStr(name);
- return domainMapper.selectByPage(ns, tab, code, limit, offset);
+ return domainMapper.selectByPage(ns, tab, name, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/DomainMapper.xml b/src/main/resources/mapper/data/DomainMapper.xml
index af036da..1960ca8 100644
--- a/src/main/resources/mapper/data/DomainMapper.xml
+++ b/src/main/resources/mapper/data/DomainMapper.xml
@@ -7,8 +7,8 @@
<if test="tab != null">
and b.tab = #{tab}
</if>
- <if test="code != null">
- and a.dom_code like #{code}
+ <if test="name != null">
+ and (dom_desc like #{name} or dom_name like #{name})
</if>
</select>
@@ -18,8 +18,8 @@
<if test="tab != null">
and b.tab = #{tab}
</if>
- <if test="code != null">
- and a.dom_code like #{code}
+ <if test="name != null">
+ and (dom_desc like #{name} or dom_name like #{name})
</if>
order by a.id
limit #{limit} offset #{offset}
--
Gitblit v1.9.3