From 9f29a071a7f94ff8caa3dfc8967f1ef5fd7bc099 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 16:23:09 +0800
Subject: [PATCH] 单位出资人查询修改
---
src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml | 8 +++++++-
src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java | 3 ++-
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 6 +++---
src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java | 2 +-
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
index 33ad420..8e7317d 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -134,12 +134,12 @@
/**
* 出资人信息
- * @param creditcode
+ * @param shareholderVO
* @return
*/
@PostMapping("/selectShareholderInfo")
- public R<IPage<ShareholderVO>> selectShareholderInfo(String creditcode, Query query) {
- IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), creditcode);
+ public R<IPage<ShareholderVO>> selectShareholderInfo(ShareholderVO shareholderVO, Query query) {
+ IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
return R.data(pages);
}
diff --git a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
index 30c6993..4c2854a 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.vo.ShareholderVO;
@@ -39,5 +40,5 @@
* @return
*/
List<ShareholderVO> selectShareholderPage(IPage page, ShareholderVO shareholder);
- List<ShareholderVO> selectShareholderInfo(IPage page,String creditcode);
+ List<ShareholderVO> selectShareholderInfo(IPage page,@Param("shareholder") ShareholderVO shareholderVO);
}
diff --git a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
index 6aecf9a..22f5c81 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
@@ -22,7 +22,13 @@
<select id="selectShareholderInfo" resultMap="shareholderResultMap">
- select * from sys_shareholder where creditCode=#{creditcode}
+ select * from sys_shareholder where creditCode = #{shareholder.creditcode}
+ <if test="shareholder.cardid!=null and shareholder.cardid!=''">
+ and cardid like concat('%', #{shareholder.cardid},'%')
+ </if>
+ <if test="shareholder.shareholder!=null and shareholder.shareholder!=''">
+ and shareholder like concat('%',#{shareholder.shareholder},'%')
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java b/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
index a87581d..30e61d5 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
@@ -24,6 +24,6 @@
* @return
*/
IPage<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder);
- IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode);
+ IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page,ShareholderVO shareholderVO);
void importshare(List<shareExcel> data, Boolean isCovered);
}
diff --git a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
index 0a9a036..c11da19 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
@@ -45,8 +45,8 @@
}
@Override
- public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode) {
- return page.setRecords(baseMapper.selectShareholderInfo(page,creditcode));
+ public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, ShareholderVO shareholderVO) {
+ return page.setRecords(baseMapper.selectShareholderInfo(page,shareholderVO));
}
@Override
--
Gitblit v1.9.3