feat: 增加家庭成员2

admin/src/main/java/com/anplus/hr/domain/params/EmployeeBaseInfoParam.java

@@ -199,7 +199,7 @@ public class EmployeeBaseInfoParam {
     /**
      * 家庭成员
      */
-    private List<EmployeeFamilyMembersParam> employeeFamilyMembers;
+    private List<EmployeeFamilyMembersParam> familyMembers;
 
     /**
      * tid

admin/src/main/java/com/anplus/hr/domain/vo/EmployeeInfoVo.java

@@ -17,6 +17,7 @@ import top.binfast.common.excel.converters.ExcelUrlImageConverter;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.util.List;
 
 
 /**
@@ -599,6 +600,12 @@ public class EmployeeInfoVo implements TransPojo, Serializable {
     @ExcelProperty(value = "小区具体信息")
     private String antaiCommunityInfo;
 
+    /**
+     * 员工家庭成员
+     */
+    @ExcelIgnore
+    private List<EmployeeFamilyMembersVo> familyMembers;
+
     /**
      * 员工状态
      */

admin/src/main/java/com/anplus/hr/mapper/EmployeeFamilyMembersMapper.java

 package com.anplus.hr.mapper;
 
 import com.anplus.hr.domain.EmployeeFamilyMembers;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import top.binfast.common.mybatis.mapper.BinBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 员工家庭主要成员Mapper接口
  *
@@ -13,4 +16,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface EmployeeFamilyMembersMapper extends BinBaseMapper<EmployeeFamilyMembers> {
 
+    default List<EmployeeFamilyMembers> selectByEmployeeId(Long employeeId) {
+        return selectList(new LambdaUpdateWrapper<EmployeeFamilyMembers>()
+                .eq(EmployeeFamilyMembers::getEmployeeId, employeeId));
+    }
+
 }

admin/src/main/java/com/anplus/hr/service/impl/EmployeeInfoResignServImpl.java

@@ -8,6 +8,7 @@ import com.anplus.hr.domain.EmployeeFamilyMembers;
 import com.anplus.hr.domain.EmployeeInfo;
 import com.anplus.hr.domain.params.EmployeeInfoListParam;
 import com.anplus.hr.domain.params.EmployeeInfoParam;
+import com.anplus.hr.domain.vo.EmployeeFamilyMembersVo;
 import com.anplus.hr.domain.vo.EmployeeInfoResignImportVo;
 import com.anplus.hr.domain.vo.EmployeeInfoResignVo;
 import com.anplus.hr.domain.vo.EmployeeInfoVo;
@@ -45,7 +46,7 @@ import java.util.stream.Stream;
  */
 @RequiredArgsConstructor
 @Service
-public class EmployeeInfoResignServImpl extends ServiceImpl<EmployeeInfoMapper, EmployeeInfo>  implements EmployeeInfoResignServ {
+public class EmployeeInfoResignServImpl extends ServiceImpl<EmployeeInfoMapper, EmployeeInfo> implements EmployeeInfoResignServ {
 
     private final EmployeeInfoMapper employeeInfoMapper;
     private final EmployeeInfoServ employeeInfoServ;
@@ -57,7 +58,6 @@ public class EmployeeInfoResignServImpl extends ServiceImpl<EmployeeInfoMapper,
 
     /**
      * 分页查询员工信息列表
-     *
      */
     @Override
     public PageResponse<EmployeeInfoResignVo> queryPageList(EmployeeInfoListParam param) {
@@ -70,7 +70,6 @@ public class EmployeeInfoResignServImpl extends ServiceImpl<EmployeeInfoMapper,
 
     /**
      * 查询符合条件的员工信息列表
-     *
      */
     @Override
     public List<EmployeeInfoResignVo> queryList(EmployeeInfoListParam param) {
@@ -91,7 +90,6 @@ public class EmployeeInfoResignServImpl extends ServiceImpl<EmployeeInfoMapper,
 
     /**
      * 导入离职员工信息列表
-     *
      */
     @Override
     public Response importEmployeeResignList(Stream<EmployeeInfoResignImportVo> list, MultipartFile file) {
@@ -204,6 +202,10 @@ public class EmployeeInfoResignServImpl extends ServiceImpl<EmployeeInfoMapper,
                 employeeAsyncService.matchingUrl(employeeInfoVo);
             }
         }
+        List<EmployeeFamilyMembers> familyMembers = employeeFamilyMembersMapper.selectByEmployeeId(employeeInfo.getId());
+        if (CollUtil.isNotEmpty(familyMembers)) {
+            employeeInfoVo.setFamilyMembers(MapstructUtils.convert(familyMembers, EmployeeFamilyMembersVo.class));
+        }
         transService.transOne(employeeInfoVo);
         return employeeInfoVo;
     }

admin/src/main/java/com/anplus/hr/service/impl/EmployeeInfoServImpl.java

@@ -17,10 +17,7 @@ import com.anplus.hr.domain.EmployeeFamilyMembers;
 import com.anplus.hr.domain.EmployeeFlow;
 import com.anplus.hr.domain.EmployeeInfo;
 import com.anplus.hr.domain.params.*;
-import com.anplus.hr.domain.vo.EmployeeFlowVo;
-import com.anplus.hr.domain.vo.EmployeeInfoImportVo;
-import com.anplus.hr.domain.vo.EmployeeInfoResumeVo;
-import com.anplus.hr.domain.vo.EmployeeInfoVo;
+import com.anplus.hr.domain.vo.*;
 import com.anplus.hr.mapper.EmployeeFamilyMembersMapper;
 import com.anplus.hr.mapper.EmployeeInfoMapper;
 import com.anplus.hr.service.EmployeeAuditLogServ;
@@ -415,6 +412,10 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ
                 employeeAsyncService.matchingUrl(employeeInfoVo);
             }
         }
+        List<EmployeeFamilyMembers> familyMembers = employeeFamilyMembersMapper.selectByEmployeeId(employeeInfo.getId());
+        if (CollUtil.isNotEmpty(familyMembers)) {
+            employeeInfoVo.setFamilyMembers(MapstructUtils.convert(familyMembers, EmployeeFamilyMembersVo.class));
+        }
         transService.transOne(employeeInfoVo);
         return employeeInfoVo;
     }
@@ -492,8 +493,8 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ
         employeeInfo.setEntryApplyStatus(HrFlowEnum.DRAFT.getStatus());
         employeeInfo.setStatus(HrStatusEnum.DRAFT.getStatus());
         boolean flag = this.save(employeeInfo);
-        if (flag && CollUtil.isNotEmpty(param.getEmployeeFamilyMembers())) {
-            List<EmployeeFamilyMembersParam> familyMembers = param.getEmployeeFamilyMembers();
+        if (flag && CollUtil.isNotEmpty(param.getFamilyMembers())) {
+            List<EmployeeFamilyMembersParam> familyMembers = param.getFamilyMembers();
             for (EmployeeFamilyMembersParam familyMember : familyMembers) {
                 familyMember.setEmployeeId(employeeInfo.getId());
                 if (HrEmployeeConstants.YES.equals(familyMember.getEmergencyFlag())) {