From f2e2e1780391c728bc9d66062be07460328236ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 12 Feb 2026 14:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=85=A5=E8=81=8C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=9D=E5=AD=98=E5=88=B0=E6=97=A5=E5=BF=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/IEmployeesAdvisioryInfoApi.java | 4 ++ .../employees/entity/EmployeesOrg.java | 66 +++++++++++++++++++ .../entity/NuEmployeesAdvisoryInfo.java | 6 ++ .../mapper/NuEmployeesAdvisoryInfoMapper.java | 2 + .../xml/NuEmployeesAdvisoryInfoMapper.xml | 39 +++++++++++ .../service/impl/EmployeesOrgServiceImpl.java | 31 +++++++++ .../NuEmployeesAdvisoryInfoServiceImpl.java | 9 +++ .../mapper/xml/OrgApplyInfoMapper.xml | 1 + .../employees/api/EmployeesInfoApi.java | 11 ++++ .../entity/EmployeesAdvisoryInfoEntity.java | 6 ++ .../com/nu/entity/EmployeesApplyEntity.java | 2 + 11 files changed, 177 insertions(+) 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 2b0dcb2..81b5fa3 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 org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,4 +21,7 @@ public interface IEmployeesAdvisioryInfoApi { JSONObject getEmployeeInfo(String tel); boolean validateChanged(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); + + EmployeesAdvisoryInfoEntity queryEmployeeInfoById(String id); + } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java index 068ecd3..ad9c581 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java @@ -105,5 +105,71 @@ public class EmployeesOrg implements Serializable { @TableField(exist = false) private String departName; + /**联系电话*/ + private String tel; + /**咨询人姓名*/ + 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; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java index d425c70..9a5a4da 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java @@ -288,6 +288,12 @@ public class NuEmployeesAdvisoryInfo implements Serializable { @TableField(exist = false) private String auditContent; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "变更申请日期") + @TableField(exist = false) + private java.util.Date auditTime; + private String lastLoginOrg;//最近一次登录机构编码 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java index 77a8d92..6fa3663 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java @@ -22,4 +22,6 @@ public interface NuEmployeesAdvisoryInfoMapper extends BaseMapper queryEmployeeInfo(@Param("openId") String openId, @Param("orgCode") String orgCode); NuEmployeesAdvisoryInfo getEmployeeInfoByTel(@Param("tel") String tel); + + NuEmployeesAdvisoryInfo queryEmployeeInfoById(@Param("id") String id); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index 57e998a..6bf96d3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -67,4 +67,43 @@ WHERE adinfo.tel = #{tel} + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java index e78e097..8b8e5ba 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java @@ -49,6 +49,37 @@ public class EmployeesOrgServiceImpl extends ServiceImpl select + eo.id as id, d.id as orgId, d.depart_name, d.org_code, diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesInfoApi.java index a0a0ecd..c4dcbe4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesInfoApi.java @@ -72,4 +72,15 @@ public class EmployeesInfoApi { } return Result.ok(employeesAdvisioryInfoApi.queryAuditInfo(openId, orgCode)); } + + /** + * 根据id获取员工变更信息 + * + * @param id + * @return + */ + @GetMapping("/queryEmployeeInfoById") + public Result queryEmployeeInfoById(@RequestParam("id") String id) { + return Result.ok(employeesAdvisioryInfoApi.queryEmployeeInfoById(id)); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java index 2c0c0e0..37fdf6a 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java @@ -131,6 +131,12 @@ public class EmployeesAdvisoryInfoEntity implements Serializable { private String applyStatus; private String auditContent; + + /**变更申请日期*/ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date auditTime; + /** * 现住址 */ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java index 92d1cc9..8c8f3e0 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java @@ -67,6 +67,8 @@ public class EmployeesApplyEntity implements Serializable { private String idCardPositive; /**身份证反面*/ private String idCardNegative; + /**签发机关*/ + private String issuingAuthority; /**健康证正面*/ private String healthCertificatePositive; /**健康证反面*/