From aef241821ada481c09a01f21e46c841d4e7da536 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 16 Mar 2024 20:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lihongjie/coal/employee/dto/CreateEmployeeDto.java   | 5 +++++
 .../java/cn/lihongjie/coal/employee/dto/EmployeeDto.java | 5 +++++
 .../lihongjie/coal/employee/dto/UpdateEmployeeDto.java   | 6 ++++++
 .../cn/lihongjie/coal/employee/entity/EmpCertVO.java     | 2 ++
 .../lihongjie/coal/employee/service/EmployeeService.java | 9 +++++++++
 5 files changed, 27 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
index 57e07d43..ec40813c 100644
--- a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
+++ b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
@@ -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.EmpCarVO;
 import cn.lihongjie.coal.employee.entity.EmpCertVO;
 import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
 
@@ -77,6 +78,10 @@ public class CreateEmployeeDto extends OrgCommonDto {
     @Comment("员工证件信息")
     private List<EmpCertVO> certs;
 
+    @ElementCollection
+    @Comment("员工车辆信息")
+    private List<EmpCarVO> cars;
+
     @Comment("养老保险基数")
     private Double insurance1Base;
     @Comment("养老保险比例")
diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
index 17824439..ad3ff1ac 100644
--- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
+++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
@@ -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.EmpCarVO;
 import cn.lihongjie.coal.employee.entity.EmpCertVO;
 import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
 import cn.lihongjie.coal.file.entity.FileEntity;
@@ -115,6 +116,10 @@ public class EmployeeDto extends OrgCommonDto {
     @Comment("员工证件信息")
     private List<EmpCertVO> certs;
 
+    @ElementCollection
+    @Comment("员工车辆信息")
+    private List<EmpCarVO> cars;
+
 
     @Comment("养老保险基数")
     private Double insurance1Base;
diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
index 4f6453e1..bb71418b 100644
--- a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
+++ b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
@@ -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.EmpCarVO;
 import cn.lihongjie.coal.employee.entity.EmpCertVO;
 import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
 
@@ -74,10 +75,15 @@ public class UpdateEmployeeDto extends OrgCommonDto {
     private List<EmpFamilyMemberVO> familyMembers;
 
 
+
+
     @ElementCollection
     @Comment("员工证件信息")
     private List<EmpCertVO> certs;
 
+    @ElementCollection
+    @Comment("员工车辆信息")
+    private List<EmpCarVO> cars;
     @Comment("养老保险基数")
     private Double insurance1Base;
     @Comment("养老保险比例")
diff --git a/src/main/java/cn/lihongjie/coal/employee/entity/EmpCertVO.java b/src/main/java/cn/lihongjie/coal/employee/entity/EmpCertVO.java
index d3c7d832..77fb96a3 100644
--- a/src/main/java/cn/lihongjie/coal/employee/entity/EmpCertVO.java
+++ b/src/main/java/cn/lihongjie/coal/employee/entity/EmpCertVO.java
@@ -41,6 +41,8 @@ public class EmpCertVO {
     @Type(ListArrayType.class)
     private List<String> fileIds;
 
+
+
     @Transient
     private List<FileEntity> files;
 
diff --git a/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java b/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java
index 6d0570e2..18f5a770 100644
--- a/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java
+++ b/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java
@@ -71,6 +71,15 @@ class EmployeeService extends BaseService<EmployeeEntity, EmployeeRepository> {
                                     x.setFiles(fileService.findAllByIds(x.getFileIds()));
                             });
             
+        }
+        if (CollectionUtils.isNotEmpty(dto.getCars())) {
+            dto.getCars()
+                    .forEach(
+                            x -> {
+                                if (CollectionUtils.isNotEmpty(x.getFileIds()))
+                                    x.setFiles(fileService.findAllByIds(x.getFileIds()));
+                            });
+
         }
         return dto;
     }