Commit 373a7775 authored by 刘斌's avatar 刘斌

feat: 增加家庭成员6

parent d1104dad
...@@ -489,7 +489,7 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ ...@@ -489,7 +489,7 @@ public class EmployeeInfoServImpl extends ServiceImpl<EmployeeInfoMapper, Employ
familyMembersCmdExe.updateEmergencyInfo(param.getFamilyMembers(), employeeInfo); familyMembersCmdExe.updateEmergencyInfo(param.getFamilyMembers(), employeeInfo);
boolean flag = this.updateById(employeeInfo); boolean flag = this.updateById(employeeInfo);
if (flag) { if (flag) {
familyMembersCmdExe.insertByEmployee(param.getFamilyMembers(), employeeInfo); familyMembersCmdExe.updateByEmployee(param.getFamilyMembers(), employeeInfo);
} }
return flag; return flag;
} }
......
...@@ -13,9 +13,13 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; ...@@ -13,9 +13,13 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.trans.service.impl.TransService; import org.dromara.trans.service.impl.TransService;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.binfast.common.core.util.LambdaUtil;
import top.binfast.common.core.util.MapstructUtils; import top.binfast.common.core.util.MapstructUtils;
import top.binfast.common.mybatis.bean.model.BaseModel;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* @author 刘斌 * @author 刘斌
...@@ -68,11 +72,20 @@ public class EmployeeFamilyMembersCmdExe { ...@@ -68,11 +72,20 @@ public class EmployeeFamilyMembersCmdExe {
return false; return false;
} }
Long employeeId = employeeInfo.getId(); Long employeeId = employeeInfo.getId();
boolean exists = employeeFamilyMembersMapper.exists(new LambdaUpdateWrapper<EmployeeFamilyMembers>() List<EmployeeFamilyMembers> exitFamilyMembersList = employeeFamilyMembersMapper.selectByEmployeeId(employeeId);
.eq(EmployeeFamilyMembers::getEmployeeId, employeeId)); if (CollUtil.isNotEmpty(exitFamilyMembersList)) {
if (exists) { Map<Long, Boolean> updateMap = LambdaUtil.filterToMap(familyMembers, (t) -> t.getId() != null, EmployeeFamilyMembersParam::getId, (t) -> true);
employeeFamilyMembersMapper.deleteByEmployeeId(employeeId); List<Long> deleteIdList = exitFamilyMembersList.stream()
.map(BaseModel::getId)
.filter(id -> updateMap.get(id) == null)
.collect(Collectors.toList());
employeeFamilyMembersMapper.deleteByIds(deleteIdList);
} }
// boolean exists = employeeFamilyMembersMapper.exists(new LambdaUpdateWrapper<EmployeeFamilyMembers>()
// .eq(EmployeeFamilyMembers::getEmployeeId, employeeId));
// if (exists) {
// employeeFamilyMembersMapper.deleteByEmployeeId(employeeId);
// }
return insertByEmployee(familyMembers, employeeInfo); return insertByEmployee(familyMembers, employeeInfo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment