From 4ca066f4464498a0b2d9da286658aa8d3dd8c505 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 25 Jun 2025 08:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=AF=B7=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E6=97=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8B=E6=AC=A1=E7=99=BB=E5=BD=95=E8=BF=98=E6=98=AF=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/IEmployessAdvisioryInfoApi.java | 2 ++ .../entity/EmployeesAdvisoryInfoEntity.java | 7 +++++++ .../entity/NuBizAdvisoryInfo.java | 4 ++++ .../entity/NuEmployeesAdvisoryInfo.java | 1 + .../mapper/NuEmployeesAdvisoryInfoMapper.java | 2 ++ .../xml/NuEmployeesAdvisoryInfoMapper.xml | 18 ++++++++++++++++++ .../NuEmployeesAdvisoryInfoServiceImpl.java | 8 ++++++++ .../orgapplyinfo/api/OrgApplyInfoApi.java | 16 ++++++++++++++++ 8 files changed, 58 insertions(+) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java index 78ba6e7..cfd525c 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java @@ -12,4 +12,6 @@ public interface IEmployessAdvisioryInfoApi { int updateById(EmployeesAdvisoryInfoEntity eployeesAdvisoryInfoEntity); List queryAuditInfo(String tel); + + int updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); } diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/entity/EmployeesAdvisoryInfoEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/entity/EmployeesAdvisoryInfoEntity.java index e0bd1ad..024c607 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/entity/EmployeesAdvisoryInfoEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/entity/EmployeesAdvisoryInfoEntity.java @@ -9,6 +9,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; @@ -34,6 +35,7 @@ public class EmployeesAdvisoryInfoEntity implements Serializable { /**联系电话*/ private String tel; /**状态 1审核中 2审核完成 3驳回 */ + @Dict(dicCode = "org_apply_status") private String status; /**审核备注*/ private String content; @@ -113,4 +115,9 @@ public class EmployeesAdvisoryInfoEntity implements Serializable { private String qualificationPath; /**无犯罪正面*/ private String noCrimeCertificate; + private String advisoryType; + private String izYg; + private String izJs; + private String izJg; + } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java index 96ceee4..5c4ad6c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java @@ -116,6 +116,10 @@ public class NuBizAdvisoryInfo implements Serializable { @ApiModelProperty(value = "是否入住0否 1是(是否入住过）") private String izCheckIn; + private String izYg;//是否是员工 0否 1是 + private String izJs;//是否是家属 0否 1是 + private String izJg;//是否是机构 0否 1是 + @TableField(exist = false) private String advisoryTypeName; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java index 79bd502..55c1829 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java @@ -53,6 +53,7 @@ public class NuEmployeesAdvisoryInfo implements Serializable { /**状态 1审核中 2审核完成 3驳回 */ @Excel(name = "状态 1审核中 2审核完成 3驳回 ", width = 15) @ApiModelProperty(value = "状态 1审核中 2审核完成 3驳回 ") + @Dict(dicCode = "org_apply_status") private java.lang.String status; /**审核备注*/ @Excel(name = "审核备注", width = 15) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java index de7180f..3098f27 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java @@ -2,6 +2,7 @@ package com.nu.modules.nuEmployeesAdvisoryInfo.mapper; import java.util.List; +import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity; import org.apache.ibatis.annotations.Param; import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface NuEmployeesAdvisoryInfoMapper extends BaseMapper { + void updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index 8196277..c9a8622 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -2,4 +2,22 @@ + + update nu_biz_advisory_info + + + advisory_type = #{advisoryType}, + + + iz_yg = #{izYg}, + + + iz_jg = #{izJg}, + + + iz_js = #{izJs}, + + + where tel = #{tel} + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 83b257d..a124483 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -1,8 +1,10 @@ package com.nu.modules.nuEmployeesAdvisoryInfo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi; import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity; +import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo; import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo; import com.nu.modules.nuEmployeesAdvisoryInfo.mapper.NuEmployeesAdvisoryInfoMapper; import com.nu.modules.nuEmployeesAdvisoryInfo.service.INuEmployeesAdvisoryInfoService; @@ -57,4 +59,10 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl save(@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { + System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------"+orgApplyInfoApiEntity.getTel()); + if(StringUtils.isNotBlank(orgApplyInfoApiEntity.getTel())){ + EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); + employeesAdvisoryInfoEntity.setTel(orgApplyInfoApiEntity.getTel()); + employeesAdvisoryInfoEntity.setAdvisoryType("3"); + employeesAdvisoryInfoEntity.setIzJg("1"); + System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity1------------"+employeesAdvisoryInfoEntity.getTel()); + System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity2------------"+employeesAdvisoryInfoEntity.getAdvisoryType()); + System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity3------------"+employeesAdvisoryInfoEntity.getIzJg()); + employessAdvisioryInfoApi.updateByTel(employeesAdvisoryInfoEntity); + } if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) { orgApplyInfoApi.updateById(orgApplyInfoApiEntity); return Result.ok("保存成功！");