From 8c75b6ac436baac61b956a61ad326bbc70381401 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 28 Feb 2026 10:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/IEmployeesAdvisioryInfoApi.java | 2 + .../NuEmployeesAdvisoryInfoServiceImpl.java | 9 +++ .../listener/EmployeesMQListener.java | 37 +++++++++ .../employees/api/EmployeesInfoApi.java | 12 +++ .../com/nu/entity/EmployeesOrgApiEntity.java | 77 ++++++++++++++++++- 5 files changed, 135 insertions(+), 2 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployeesInfo/api/IEmployeesAdvisioryInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployeesInfo/api/IEmployeesAdvisioryInfoApi.java index 81b5fa3..f0f350c 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployeesInfo/api/IEmployeesAdvisioryInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployeesInfo/api/IEmployeesAdvisioryInfoApi.java @@ -2,6 +2,7 @@ package com.nu.modules.EmployeesInfo.api; import cn.hutool.json.JSONObject; import com.nu.entity.EmployeesAdvisoryInfoEntity; +import com.nu.entity.EmployeesOrgApiEntity; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,4 +25,5 @@ public interface IEmployeesAdvisioryInfoApi { EmployeesAdvisoryInfoEntity queryEmployeeInfoById(String id); + EmployeesOrgApiEntity queryEmployeeInfoByOrgId(String id); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 33c2cf2..9a18ca4 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.EmployeesApplyMQDto; import com.nu.dto.EmployeesStatusMQDto; +import com.nu.entity.EmployeesOrgApiEntity; import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi; import com.nu.entity.EmployeesAdvisoryInfoEntity; import com.nu.modules.employees.entity.EmployeesOrg; @@ -232,6 +233,14 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl queryEmployeeInfoById(@RequestParam("id") String id) { return Result.ok(employeesAdvisioryInfoApi.queryEmployeeInfoById(id)); } + + /** + * 根据id获取审核记录员工信息 + * + * @param id + * @return + */ + @GetMapping("/queryEmployeeInfoByOrgId") + public Result queryEmployeeInfoByOrgId(@RequestParam("id") String id) { + return Result.ok(employeesAdvisioryInfoApi.queryEmployeeInfoByOrgId(id)); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesOrgApiEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesOrgApiEntity.java index a6c8a8c..a26e2f1 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesOrgApiEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesOrgApiEntity.java @@ -1,6 +1,7 @@ package com.nu.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -45,10 +47,81 @@ public class EmployeesOrgApiEntity implements Serializable { private String izOnline; /**冻结状态 0未冻结 1冻结*/ private String izFreeze; - /**申请状态 1申请中 2通过 3驳回*/ - private String status; /**审核备注*/ private String auditContent; /**申请类型 0被邀请 1主动申请 */ private java.lang.String applyType; + + + /**联系电话*/ + private String tel; + /**状态 1审核中 2审核完成 3驳回 */ + @Dict(dicCode = "org_apply_status") + private String status; + + + /**咨询人姓名*/ + private String name; + /**性别*/ + private String sex; + /**民族*/ + private String national; + /**出生日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日") + @DateTimeFormat(pattern="yyyy年MM月dd日") + private Date birthDate; + /**住址（身份证上）*/ + private String idCardAddress; + /**身份证号*/ + private String idCard; + /**签发机关*/ + private String issuingAuthority; + /**有效开始日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date startTime; + /**有效结束日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date endTime; + /**身份证正面*/ + private String cardZmPath; + /**身份证反面*/ + private String cardFmPath; + /**婚否（0未婚 1已婚）*/ + private String maritalStatus; + /**身高*/ + private String height; + /**体重*/ + private String weight; + /**健康状况（0健康 1患病）*/ + private String healthStatus; + /**政治面貌（0共产党员 1民主党 2国民党 3无党派）*/ + private String politicalAppearance; + /**紧急联系人姓名*/ + private String contactName; + /**紧急联系人电话*/ + private String contactTel; + /**紧急联系人与本人关系*/ + private String contactRelationship; + /**户口性质（0农业 1非农业）*/ + private String hukouType; + /**银行卡正面*/ + private String bankZmPath; + /**银行卡反面*/ + private String bankFmPath; + /**开户行*/ + private String openingBank; + /**银行卡号*/ + private String bankCard; + /**健康证正面*/ + private String healthZmPath; + /**健康证反面*/ + private String healthFmPath; + /**资质证(可多张)*/ + private String qualificationPath; + /**无犯罪正面*/ + private String noCrimeCertificate; + /**现住址*/ + private String currentAddress; }