From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
index 4e063ea..4c3fcf2 100644
--- a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
@@ -27,6 +27,8 @@
 import org.springblade.modules.shareholder.entity.Shareholder;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Objects;
 
@@ -45,14 +47,19 @@
 	}
 
 	@Override
-	public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode) {
-		return page.setRecords(baseMapper.selectMemberInfo(page,creditcode));
+	public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,Member member) {
+		return page.setRecords(baseMapper.selectMemberInfo(page,member));
 	}
 
 	@Override
 	public void importmember(List<memberExcel> data, Boolean isCovered) {
 		data.forEach(memberExcel -> {
 			Member member = Objects.requireNonNull(BeanUtil.copy(memberExcel, Member.class));
+			try {
+				member.setRtime(new SimpleDateFormat("yyyy/MM/dd").parse(memberExcel.getRtime()));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
 			this.save(member);
 		});
 	}

--
Gitblit v1.9.3