From 1da1e6bcc1edb8a9987504d5a6ea906e730bfe45 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 6 Mar 2026 10:47:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E5=90=8E?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=98=E5=82=A8=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=99=BB=E5=BD=95?= =?UTF-8?q?pad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/EmployeesOrgMapper.xml | 2 +- .../entity/EmployeesAdvisoryInfoEntity.java | 8 +++++ .../system/service/impl/SysBaseApiImpl.java | 29 +++++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml index 0a58d9c..7697f7d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml @@ -11,7 +11,7 @@ LEFT JOIN sys_depart b ON a.org_code = b.org_code WHERE a.employees_id = #{employeesId} - AND a.iz_freeze = 'N' zhuangt + AND a.iz_freeze = 'N' AND a.iz_history = 'N' AND b.status = '1' 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 2eed205..5da7c2a 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 @@ -143,4 +143,12 @@ public class EmployeesAdvisoryInfoEntity implements Serializable { private String currentAddress; private String modifyStatus; + + private String lastLoginOrg;//最近一次登录机构编码 + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date lastLoginTime;//最近上一次登录时间 + + private String izInit;//是否需要员工初始化 0否 1是 } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 29ab693..43afe84 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -16,6 +16,8 @@ import com.google.common.base.Joiner; import com.google.common.collect.Maps; import com.nu.dto.EmployeesApplyMQDto; import com.nu.dto.OrgApplyInfoMQDto; +import com.nu.entity.EmployeesAdvisoryInfoEntity; +import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi; import com.nu.utils.RabbitMQUtil; import org.apache.commons.compress.utils.Lists; import org.jeecg.common.api.vo.Result; @@ -156,6 +158,8 @@ public class SysBaseApiImpl implements ISysBaseAPI { private DataSourceLoader dataSourceLoader; @Autowired private RabbitMQUtil rabbitMQUtil; + @Autowired + private IEmployeesAdvisioryInfoApi employeesAdvisioryInfoApi; @Override //@SensitiveDecode @@ -2055,10 +2059,31 @@ public class SysBaseApiImpl implements ISysBaseAPI { mqDto.setIdCardPositive(orgInfo.getCardZmPath());//身份证正面 mqDto.setIdCardNegative(orgInfo.getCardFmPath());//身份证反面 } - mqDto.setTel((String) map.get("tel")); - mqDto.setOpenId((String) map.get("openId")); + mqDto.setTel(orgInfo.getTel()); + mqDto.setOpenId(orgInfo.getOpenId()); rabbitMQUtil.sendToExchange("hldy.org", dataSourceCode + ".orgapply.upuseremployeesid", mqDto); + + //登录会去nu_biz_employees_advisory_info中查询数据 获取登录的机构 所以这里也要插入数据 + EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); + employeesAdvisoryInfoEntity.setId(userId); + employeesAdvisoryInfoEntity.setOpenId(orgInfo.getOpenId()); + employeesAdvisoryInfoEntity.setTel(orgInfo.getTel()); + employeesAdvisoryInfoEntity.setIzEntry("Y"); + employeesAdvisoryInfoEntity.setName(orgInfo.getName()); + employeesAdvisoryInfoEntity.setSex(orgInfo.getSex()); + employeesAdvisoryInfoEntity.setNational(orgInfo.getNational()); + employeesAdvisoryInfoEntity.setBirthDate(orgInfo.getBirthDate()); + employeesAdvisoryInfoEntity.setIdCardAddress(orgInfo.getIdCardAddress()); + employeesAdvisoryInfoEntity.setIdCard(orgInfo.getIdCard()); + employeesAdvisoryInfoEntity.setIssuingAuthority(orgInfo.getIssuingAuthority()); + employeesAdvisoryInfoEntity.setStartTime(orgInfo.getStartTime()); + employeesAdvisoryInfoEntity.setEndTime(orgInfo.getEndTime()); + employeesAdvisoryInfoEntity.setCardZmPath(orgInfo.getCardZmPath()); + employeesAdvisoryInfoEntity.setCardFmPath(orgInfo.getCardFmPath()); + employeesAdvisoryInfoEntity.setLastLoginOrg(dataSourceCode); + employeesAdvisoryInfoEntity.setIzInit("Y"); + employeesAdvisioryInfoApi.insert(employeesAdvisoryInfoEntity); }