diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java index 89559922..f9437175 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java @@ -105,15 +105,15 @@ public class CompanyStaffController { } /** - * 创建员工信息,在角色和用户已经存在的情况下用 + * 创建、修改员工信息,在角色和用户已经存在的情况下用 * * @author 小李 * @date 17:26 2024/12/19 * @param staffRespVO 信息 **/ - @PostMapping("/createByExistUser") - public CommonResult createByExistUser(@RequestBody CompanyStaffRespVO staffRespVO){ - staffService.createByExistUser(staffRespVO); + @PostMapping("/updateByExistUser") + public CommonResult updateByExistUser(@RequestBody CompanyStaffRespVO staffRespVO){ + staffService.updateByExistUser(staffRespVO); return CommonResult.ok(); } diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java index 74a0c26f..69f73056 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java @@ -120,13 +120,13 @@ public class CompanyStaff extends TenantBaseDO { @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") @DateTimeFormat(pattern="yyyy-MM-dd") @ExcelProperty("转正时间") - private LocalDateTime formalDate; + private Date formalDate; /** 购买保险时间 */ @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") @DateTimeFormat(pattern="yyyy-MM-dd") @ExcelProperty("购买保险时间") - private LocalDateTime safeDate; + private Date safeDate; /** 附件的名称们,手动填写,逗号分隔,没有也要占位,和下面的urls对应 */ private String fileNames; diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java index a1babc40..7fbfb129 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java @@ -141,12 +141,12 @@ public interface CompanyStaffService extends IService { CompanyStaffRespVO getMyAdviser(Long tenantId,String sysCode); /** - * 创建员工信息,在角色和用户已经存在的情况下用 + * 创建、修改员工信息,在角色和用户已经存在的情况下用 * * @author 小李 * @date 17:26 2024/12/19 * @param staffRespVO 信息 **/ - void createByExistUser(CompanyStaffRespVO staffRespVO); + void updateByExistUser(CompanyStaffRespVO staffRespVO); } diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java index 45e11975..edcbee0e 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java @@ -689,26 +689,43 @@ public class CompanyStaffServiceImpl extends ServiceImpl