1、7629-oa转正-保存入职日期和试用期到期时间

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/business/OaBusinessServiceImpl.java

@@ -118,12 +118,14 @@ public class OaBusinessServiceImpl implements OaBusinessService {
             String uuid = IdUtil.fastSimpleUUID();
             oaBusiness.setBusinessId(uuid);
         }
-        oaBusiness.setEmployeeId(employee.getId());
-        oaBusiness.setEmployeeName(employee.getName());
-        oaBusiness.setEmployeePhone(employee.getPhone());
-        oaBusiness.setDeptId(employee.getDeptId());
-        oaBusiness.setPostId(employee.getPostId());
-        oaBusiness.setPosition(employee.getPosition());
+        if (employee != null) {
+            oaBusiness.setEmployeeId(employee.getId());
+            oaBusiness.setEmployeeName(employee.getName());
+            oaBusiness.setEmployeePhone(employee.getPhone());
+            oaBusiness.setDeptId(employee.getDeptId());
+            oaBusiness.setPostId(employee.getPostId());
+            oaBusiness.setPosition(employee.getPosition());
+        }
         oaBusiness.setUserId(loginUserId);
         oaBusiness.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_STAGING);
         oaBusiness.setInfoSource("0");

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java

@@ -45,7 +45,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -120,12 +122,23 @@ public class OaConversionServiceImpl implements OaConversionService {
             String uuid = IdUtil.fastSimpleUUID();
             oaConversion.setConversionId(uuid);
         }
-        oaConversion.setEmployeeId(employee.getId());
-        oaConversion.setEmployeeName(employee.getName());
-        oaConversion.setEmployeePhone(employee.getPhone());
-        oaConversion.setDeptId(employee.getDeptId());
-        oaConversion.setPostId(employee.getPostId());
-        oaConversion.setPosition(employee.getPosition());
+        if (employee != null) {
+            oaConversion.setEmployeeId(employee.getId());
+            oaConversion.setEmployeeName(employee.getName());
+            oaConversion.setEmployeePhone(employee.getPhone());
+            oaConversion.setDeptId(employee.getDeptId());
+            oaConversion.setPostId(employee.getPostId());
+            oaConversion.setPosition(employee.getPosition());
+            LocalDate entryDate = employee.getEntryDate();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            if (entryDate != null) {
+                oaConversion.setEntryDate(formatter.format(entryDate));
+            }
+            LocalDate probationEndDate = employee.getProbationEndDate();
+            if (probationEndDate != null) {
+                oaConversion.setProbationEndDate(formatter.format(probationEndDate));
+            }
+        }
         oaConversion.setUserId(loginUserId);
         oaConversion.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_STAGING);
         oaConversion.setInfoSource("0");
@@ -179,6 +192,15 @@ public class OaConversionServiceImpl implements OaConversionService {
         oaConversion.setDeptId(employee.getDeptId());
         oaConversion.setPostId(employee.getPostId());
         oaConversion.setPosition(employee.getPosition());
+        LocalDate entryDate = employee.getEntryDate();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        if (entryDate != null) {
+            oaConversion.setEntryDate(formatter.format(entryDate));
+        }
+        LocalDate probationEndDate = employee.getProbationEndDate();
+        if (probationEndDate != null) {
+            oaConversion.setProbationEndDate(formatter.format(probationEndDate));
+        }
         oaConversion.setUserId(loginUserId);
         oaConversion.setInfoSource("0");
         oaConversion.setApplyEmployeeId(loginEmployee.getId());
@@ -500,6 +522,15 @@ public class OaConversionServiceImpl implements OaConversionService {
         oaConversionNew.setDeptId(employee.getDeptId());
         oaConversionNew.setPostId(employee.getPostId());
         oaConversionNew.setPosition(employee.getPosition());
+        LocalDate entryDate = employee.getEntryDate();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        if (entryDate != null) {
+            oaConversionNew.setEntryDate(formatter.format(entryDate));
+        }
+        LocalDate probationEndDate = employee.getProbationEndDate();
+        if (probationEndDate != null) {
+            oaConversionNew.setProbationEndDate(formatter.format(probationEndDate));
+        }
         oaConversionNew.setUserId(loginUserId);
         oaConversionNew.setApplyEmployeeId(loginEmployee.getId());
         oaConversionNew.setApplyEmployeeName(loginEmployee.getName());

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java

@@ -129,12 +129,14 @@ public class OaRenewServiceImpl implements OaRenewService {
             String uuid = IdUtil.fastSimpleUUID();
             oaRenew.setRenewId(uuid);
         }
-        oaRenew.setEmployeeId(employee.getId());
-        oaRenew.setEmployeeName(employee.getName());
-        oaRenew.setEmployeePhone(employee.getPhone());
-        oaRenew.setDeptId(employee.getDeptId());
-        oaRenew.setPostId(employee.getPostId());
-        oaRenew.setPosition(employee.getPosition());
+        if (employee != null) {
+            oaRenew.setEmployeeId(employee.getId());
+            oaRenew.setEmployeeName(employee.getName());
+            oaRenew.setEmployeePhone(employee.getPhone());
+            oaRenew.setDeptId(employee.getDeptId());
+            oaRenew.setPostId(employee.getPostId());
+            oaRenew.setPosition(employee.getPosition());
+        }
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate contractStartDate = loginEmployee.getContractStartDate();
         if (contractStartDate != null) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -122,16 +122,18 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
             String uuid = IdUtil.fastSimpleUUID();
             oaTurnover.setTurnoverId(uuid);
         }
-        oaTurnover.setEmployeeId(employee.getId());
-        oaTurnover.setEmployeeName(employee.getName());
-        oaTurnover.setEmployeePhone(employee.getPhone());
-        oaTurnover.setDeptId(employee.getDeptId());
-        oaTurnover.setPostId(employee.getPostId());
-        oaTurnover.setPosition(employee.getPosition());
-        LocalDate entryDate = employee.getEntryDate();
-        if (entryDate != null) {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            oaTurnover.setEntryDate(entryDate.format(formatter));
+        if (employee != null) {
+            oaTurnover.setEmployeeId(employee.getId());
+            oaTurnover.setEmployeeName(employee.getName());
+            oaTurnover.setEmployeePhone(employee.getPhone());
+            oaTurnover.setDeptId(employee.getDeptId());
+            oaTurnover.setPostId(employee.getPostId());
+            oaTurnover.setPosition(employee.getPosition());
+            LocalDate entryDate = employee.getEntryDate();
+            if (entryDate != null) {
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                oaTurnover.setEntryDate(entryDate.format(formatter));
+            }
         }
         oaTurnover.setUserId(loginUserId);
         oaTurnover.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_STAGING);

yudao-module-personnel/yudao-module-employee-api/src/main/java/cn/iocoder/yudao/module/employee/api/dto/EmployeeRespDTO.java

@@ -79,6 +79,12 @@ public class EmployeeRespDTO {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate entryDate;
 
+    /**
+     * 试用期到期时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate probationEndDate;
+
     /**
      * 年假基准天数
      */