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 aba881c..e5f787a 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 @@ -1,5 +1,6 @@ package com.nu.modules.EmployessInfo.api; +import cn.hutool.json.JSONObject; import com.nu.entity.EmployeesAdvisoryInfoEntity; import java.util.List; @@ -15,4 +16,6 @@ public interface IEmployessAdvisioryInfoApi { int updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); int updateByOpenId(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); + + JSONObject getEmployeeInfo(String tel); } 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 7305518..9698918 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 @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -100,4 +98,7 @@ public class EmployeesOrg implements Serializable { @Excel(name = "修改状态", width = 15) @ApiModelProperty(value = "修改状态") private java.lang.String modifyStatus; + /**机构访问地址*/ + @TableField(exist = false) + private String serverUrl; } 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 f07e0c3..c056060 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 @@ -282,5 +282,7 @@ public class NuEmployeesAdvisoryInfo implements Serializable { private java.util.Date lastLoginTime;//最近上一次登录时间 private String izInit;//是否需要员工初始化 0否 1是 - + /**机构访问地址*/ + @TableField(exist = false) + private String serverUrl; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java index d8ca5b5..6e69ec5 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java @@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface EmployeesOrgMapper extends BaseMapper { - + List getEmployeesOrgListByEmpId(@Param("employeesId") String employeesId); } 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 f17a9ca..77a8d92 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 @@ -20,4 +20,6 @@ public interface NuEmployeesAdvisoryInfoMapper extends BaseMapper queryEmployeeInfo(@Param("openId") String openId, @Param("orgCode") String orgCode); + + NuEmployeesAdvisoryInfo getEmployeeInfoByTel(@Param("tel") String tel); } 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 404df9e..e96cbd4 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 @@ -2,4 +2,17 @@ + + 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 eb5a6d0..63bf350 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 @@ -53,4 +53,14 @@ WHERE adinfo.open_id = #{openId} + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java index 6f7dea2..d4ceba3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java @@ -3,6 +3,8 @@ package com.nu.modules.employees.service; import com.nu.modules.employees.entity.EmployeesOrg; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 员工-机构关系中间表 * @Author: jeecg-boot @@ -10,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Version: V1.0 */ public interface IEmployeesOrgService extends IService { - + List getEmployeesOrgListByEmpId(String employeesId); } 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 947d126..f3571c6 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 @@ -104,4 +104,9 @@ public class EmployeesOrgServiceImpl extends ServiceImpl getEmployeesOrgListByEmpId(String employeesId){ + return baseMapper.getEmployeesOrgListByEmpId(employeesId); + } } 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 869c077..713e123 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 @@ -181,4 +181,22 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl list = employeesOrgService.getEmployeesOrgListByEmpId(entity.getId()); + resultData.set("orgList",list); + }else{ + resultData.set("code","1"); + resultData.set("msg","此号码无效,请确认此员工是否成功入驻机构!"); + } + return resultData; + } + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/api/PadLoginApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/api/PadLoginApi.java index 9f70719..aa74dba 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/api/PadLoginApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/api/PadLoginApi.java @@ -1,5 +1,7 @@ package com.nu.modules.pad.api; +import cn.hutool.json.JSONObject; +import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi; import com.nu.modules.advisoryinfo.api.IAdvisoryInfoApi; import com.nu.modules.advisoryinfo.entity.AdvisoryInfoEntity; import org.jeecg.common.api.vo.Result; @@ -13,8 +15,10 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/pad/loginApi") public class PadLoginApi { +/* @Autowired + private IAdvisoryInfoApi advisoryInfoApi; */ @Autowired - private IAdvisoryInfoApi advisoryInfoApi; + private IEmployessAdvisioryInfoApi service; /** * 根据电话号获取信息 @@ -22,8 +26,8 @@ public class PadLoginApi { * @return */ @GetMapping("/getAdvisoryInfo") - public Result getAdvisoryInfo(@RequestParam("tel") String tel){ - AdvisoryInfoEntity advisoryInfo = advisoryInfoApi.getAdvisoryInfo(tel); - return Result.ok(advisoryInfo); + public Result getAdvisoryInfo(@RequestParam("tel") String tel){ + JSONObject resultData = service.getEmployeeInfo(tel); + return Result.ok(resultData); } } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index ed8ec6c..4e590e8 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -1050,4 +1050,6 @@ public class LoginController { } + + }