From 4b6d66e9b4c652d1d301c5ef0a0ead4d2a6b947b Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Thu, 19 Dec 2024 17:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/CompanyStaffController.java | 13 ++++++++++ .../module/staff/entity/CompanyStaff.java | 20 ++++++++++++++ .../staff/service/CompanyStaffService.java | 10 +++++++ .../service/impl/CompanyStaffServiceImpl.java | 26 +++++++++++++++++++ .../yudao/common/InspectionRoleCommon.java | 3 +++ .../service/permission/RoleServiceImpl.java | 5 +++- .../main/resources/mapper/UserRoleMapper.xml | 2 +- 7 files changed, 77 insertions(+), 2 deletions(-) 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 c09f5132..89559922 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 @@ -104,6 +104,19 @@ public class CompanyStaffController { return CommonResult.ok(); } + /** + * 创建员工信息，在角色和用户已经存在的情况下用 + * + * @author 小李 + * @date 17:26 2024/12/19 + * @param staffRespVO 信息 + **/ + @PostMapping("/createByExistUser") + public CommonResult createByExistUser(@RequestBody CompanyStaffRespVO staffRespVO){ + staffService.createByExistUser(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 5ec20c26..74a0c26f 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 @@ -16,6 +16,7 @@ import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -110,4 +111,23 @@ public class CompanyStaff extends TenantBaseDO { @TableField(exist = false) @ExcelProperty("员工角色") private String roleNames; + + /** 身份证号 */ + @ExcelProperty("身份证号") + private String IdNumber; + + /** 转正时间 */ + @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ExcelProperty("转正时间") + private LocalDateTime formalDate; + + /** 购买保险时间 */ + @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ExcelProperty("购买保险时间") + private LocalDateTime 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 1fce4aa7..a1babc40 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 @@ -139,4 +139,14 @@ public interface CompanyStaffService extends IService { * @return cn.iocoder.yudao.module.staff.entity.CompanyStaff **/ CompanyStaffRespVO getMyAdviser(Long tenantId,String sysCode); + + /** + * 创建员工信息，在角色和用户已经存在的情况下用 + * + * @author 小李 + * @date 17:26 2024/12/19 + * @param staffRespVO 信息 + **/ + void createByExistUser(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 977fed6b..45e11975 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 @@ -3,7 +3,9 @@ package cn.iocoder.yudao.module.staff.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.log.Log; import cn.iocoder.yudao.common.*; +import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; @@ -685,4 +687,28 @@ public class CompanyStaffServiceImpl extends ServiceImpl pageByQuery(RoleDO roleDO) { - return roleMapper.selectList(new LambdaQueryWrapper() + //去年检测用户 + List roleDOS = roleMapper.selectList(new LambdaQueryWrapper() .eq(RoleDO::getServicePackageId, roleDO.getServicePackageId())); + return roleDOS.stream().filter(item -> !item.getCode().equals("jcyh")).collect(Collectors.toList()); } @Override diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml index d117d59c..15a5fb49 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join system_user_role sr on su.id = sr.user_id left join system_role sr2 on sr.role_id = sr2.id - su.deleted = 0 and sr2.service_package_id = 'jiance' + su.deleted = 0 and sr2.service_package_id = 'jiance' and sr2.code != 'jcyh' and sr.role_id = #{role.roleId}