员工信息批量导入调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/controller/StaffUserInfoController.java

@@ -41,9 +41,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -141,7 +139,11 @@ public class StaffUserInfoController {
                 staffUserInfoDTO.setAge(age.toString());
                 //获取性别
                 String sex = IdCardUtil.getSex(staffUserInfoDTO.getIdCard());
-                staffUserInfoDTO.setSex(sex);
+                if (sex.equals("男")){
+                    staffUserInfoDTO.setSex("1");
+                }else {
+                    staffUserInfoDTO.setSex("2");
+                }
                 //获取出生日期
                 String birthday = IdCardUtil.getBirthday(staffUserInfoDTO.getIdCard());
                 staffUserInfoDTO.setBirthday(birthday);
@@ -154,10 +156,9 @@ public class StaffUserInfoController {
             }
 
 
-            staffUserInfoService.saveForm(staffUserInfoDTO);
+            staffUserInfoService.updateInfo(staffUserInfoDTO);
         }
-        list.addAll(dtoArrayList);
-        return ResponseEntity.ok(list);
+        return ResponseEntity.ok("导入成功");
 
 
     }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/mapper/StaffUserInfoMapper.java

@@ -40,5 +40,6 @@ public interface StaffUserInfoMapper extends BaseMapper<StaffUserInfo> {
 
     List<StaffUserInfoDTO> getByPhone(@Param("mobilePhone") String mobilePhone);
     //根据用户id查询用户信息
+    @InterceptorIgnore(tenantLine = "true")
     StaffUserInfoDTO getByUserId(@Param("userId") String userId);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/service/StaffUserInfoService.java

@@ -18,10 +18,7 @@ import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
-import com.jeeplus.sys.feign.IPostApi;
-import com.jeeplus.sys.feign.IRoleApi;
-import com.jeeplus.sys.feign.IUserApi;
-import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.feign.*;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.dto.RoleDTO;
@@ -643,4 +640,21 @@ public class StaffUserInfoService {
 
 
     }
+
+    public void updateInfo(StaffUserInfoDTO userInfoDTO) {
+        StaffUserInfo staffUserInfo = staffUserInfoMapper.selectOne(new QueryWrapper<StaffUserInfo>().eq("name", userInfoDTO.getName()).eq("del_flag", "0"));
+        if (ObjectUtils.isNotEmpty(staffUserInfo)){
+            staffUserInfo.setSex(userInfoDTO.getSex());//性别
+            staffUserInfo.setBirthday(userInfoDTO.getBirthday());//生日
+            staffUserInfo.setAge(userInfoDTO.getAge());//年龄
+            staffUserInfo.setNativePlace(userInfoDTO.getNativePlace());//籍贯
+            staffUserInfo.setOnJobStatus(userInfoDTO.getOnJobStatus());//正式
+            staffUserInfo.setDepartment(userInfoDTO.getDepartment());//所属部门
+            staffUserInfo.setMobilePhone(userInfoDTO.getMobilePhone());//联系电话
+            staffUserInfo.setInTime(userInfoDTO.getInTime());//入职时间
+            staffUserInfo.setIdCard(userInfoDTO.getIdCard());//身份证
+            staffUserInfoMapper.updateById(staffUserInfo);
+        }
+
+    }
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -415,6 +415,7 @@ public class UserService extends ServiceImpl <UserMapper, User> {
             staffUserInfoDTO.setCreateById(userDTO.getId());
             staffUserInfoDTO.setUpdateById(userDTO.getId());
             staffUserInfoDTO.setTenantId(userDTO.getTenantDTO().getId());
+            staffUserInfoDTO.setOnJobStatus("2");
             SpringUtil.getBean(IStaffUserInfoApi.class).updateUser(staffUserInfoDTO);
         }