From d4cb6034a5e05b7aa2fb4593f4c2b630be138ca1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 08 Nov 2021 19:43:58 +0800
Subject: [PATCH] 1.派遣批量新增，导入示例新增 2.社保缴纳修改，导入示例新增
---
src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 3a0a965..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
@@ -25,8 +25,10 @@
import org.springblade.modules.social.mapper.SocialMapper;
import org.springblade.modules.social.service.ISocialService;
import org.springblade.modules.social.vo.SocialVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -38,6 +40,9 @@
*/
@Service
public class SocialServiceImpl extends ServiceImpl<SocialMapper, Social> implements ISocialService {
+
+
+
@Override
public IPage<SocialVO> selectSocialPage(IPage<SocialVO> page, SocialVO social) {
return page.setRecords(baseMapper.selectSocialPage(page, social));
@@ -47,7 +52,35 @@
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