From 7c2c09439da3dccf1e032e89e1cb950b8fa1cc26 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 01 Mar 2022 20:09:57 +0800
Subject: [PATCH] 健康证,合同基础接口编写

---
 src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

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..ba702d5 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,33 @@
 	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.getSex() && !"".equals(social.getSex())) {
+//				if (social.getSex().equals("男")){
+//					social.setSex("1");
+//				}
+//				if (social.getSex().equals("女")){
+//					social.setSex("2");
+//				}
+//			}
+			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