mirror of
https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git
synced 2026-01-25 15:55:18 +08:00
添加家庭成员字段
This commit is contained in:
@@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto;
|
||||
|
||||
import cn.lihongjie.coal.base.dto.OrgCommonDto;
|
||||
import cn.lihongjie.coal.department.entity.DepartmentEntity;
|
||||
import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -64,4 +65,7 @@ public class CreateEmployeeDto extends OrgCommonDto {
|
||||
|
||||
@Comment("收款人姓名")
|
||||
private String bankCardName;
|
||||
|
||||
@Comment("家庭成员")
|
||||
private List<EmpFamilyMemberVO> familyMembers;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto;
|
||||
|
||||
import cn.lihongjie.coal.base.dto.OrgCommonDto;
|
||||
import cn.lihongjie.coal.department.entity.DepartmentEntity;
|
||||
import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
|
||||
import cn.lihongjie.coal.file.entity.FileEntity;
|
||||
|
||||
import jakarta.persistence.ManyToOne;
|
||||
@@ -104,4 +105,7 @@ public class EmployeeDto extends OrgCommonDto {
|
||||
+ " and d.code = 'emp.status'\n"
|
||||
+ " and i.code = emp_status)")
|
||||
private String empStatusName;
|
||||
|
||||
@Comment("家庭成员")
|
||||
private List<EmpFamilyMemberVO> familyMembers;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto;
|
||||
|
||||
import cn.lihongjie.coal.base.dto.OrgCommonDto;
|
||||
import cn.lihongjie.coal.department.entity.DepartmentEntity;
|
||||
import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -64,4 +65,7 @@ public class UpdateEmployeeDto extends OrgCommonDto {
|
||||
|
||||
@Comment("收款人姓名")
|
||||
private String bankCardName;
|
||||
|
||||
@Comment("家庭成员")
|
||||
private List<EmpFamilyMemberVO> familyMembers;
|
||||
}
|
||||
|
||||
@@ -373,6 +373,7 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@SneakyThrows
|
||||
public NetDiskDto createFile(CreateFileDto request) {
|
||||
|
||||
@@ -411,6 +412,8 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
|
||||
entity.setSize(request.getSize());
|
||||
save(entity);
|
||||
|
||||
entityManager.flush();
|
||||
|
||||
if (entity.getParent() != null) {
|
||||
|
||||
updateDirSize(entity.getParent().getId());
|
||||
@@ -935,6 +938,8 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
|
||||
|
||||
public void updateDirSize(String id) {
|
||||
NetDiskEntity entity = get(id);
|
||||
entityManager.refresh(entity);
|
||||
|
||||
entity.setSize(
|
||||
entity.getChildren() == null
|
||||
? 0
|
||||
|
||||
Reference in New Issue
Block a user