From fd4e3e2d5343a01a4f24e256f5fe21728e4d1536 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 16:38:52 +0800
Subject: [PATCH] 1.社保
---
src/main/java/org/springblade/modules/social/controller/SocialController.java | 4 ++--
src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/social/controller/SocialController.java b/src/main/java/org/springblade/modules/social/controller/SocialController.java
index efd7f61..59eecb5 100644
--- a/src/main/java/org/springblade/modules/social/controller/SocialController.java
+++ b/src/main/java/org/springblade/modules/social/controller/SocialController.java
@@ -136,8 +136,8 @@
*/
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
- public R importUser(MultipartFile file, Integer isCovered,String deptid) {
- SocialImporter socialImporter = new SocialImporter(socialService, isCovered == 0,deptid);
+ public R importUser(MultipartFile file,String deptid) {
+ SocialImporter socialImporter = new SocialImporter(socialService, false,deptid);
ExcelUtil.save(file, socialImporter, SocialExcel.class);
return R.success("操作成功");
}
diff --git a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
index f54b226..21ec8b3 100644
--- a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
+++ b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
@@ -28,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -51,6 +52,24 @@
public void importUser(List<SocialExcel> data, Boolean isCovered,String deptid) {
data.forEach(SocialExcel -> {
Social social = Objects.requireNonNull(BeanUtil.copy(SocialExcel, Social.class));
+ if (null!=social.getBirthday()) {
+ social.setBirthday(social.getBirthday());
+ }
+ if (null!=social.getTelephone() && !"".equals(social.getTelephone())) {
+ social.setTelephone(social.getTelephone());
+ }
+ if (null!=social.getResidence() && !"".equals(social.getResidence())) {
+ social.setResidence(social.getResidence());
+ }
+ if (null!=social.getAddress() && !"".equals(social.getAddress())) {
+ social.setAddress(social.getAddress());
+ }
+ if (null!=social.getNature() && !"".equals(social.getNature())) {
+ social.setNature(social.getNature());
+ }
+ if (null!=social.getNation() && !"".equals(social.getNation())) {
+ social.setNation(social.getNation());
+ }
social.setDeptid(deptid);
this.upSoil(social.getCardid());
this.save(social);
--
Gitblit v1.9.3