yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决根据nuid查询护理单元信息接口：调整查询方式，解决不同库相同表字段不一致问题

This commit is contained in:
1378012178@qq.com 2025-11-25 15:59:38 +08:00
parent a38354d978
commit f260f74f20
9 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -162,7 +162,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
String page = "pages/index/index"; // 点击消息跳转的页面
Map<String, Object> data = new HashMap<>();
com.alibaba.fastjson.JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode());
com.alibaba.fastjson.JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode(), null);
String companyName = orgInfo.getString("departName");
String content = companyName + "审核结果";
String auditStatus = "";

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
View File

@ -306,7 +306,7 @@ public class EmployeesMQListener {
employeesOrgService.save(employeesOrg);
//增加机构邀请员工的消息通知
JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode());
JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode(), null);
String departName = orgInfo.getString("departName");
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
nuWxNotice.setOpenId(dto.getOpenId());

2
nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java
View File

@ -31,7 +31,7 @@ public class NuCommonApi {
*/
@GetMapping("/getOrgInfo")
public Result<JSONObject> getOrgInfo(@RequestParam("orgCode") String orgCode) {
return Result.ok(sysBaseAPI.getOrgInfo(orgCode));
return Result.ok(sysBaseAPI.getOrgInfo(orgCode, null));
}
//获取标准指令库机构信息

6
nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java
View File

@ -49,7 +49,7 @@ public class SysBaseInfoApi {
*/
@GetMapping("/getOrgUrlByOrgCode")
public Result<?> getOrgUrlByOrgCode(@RequestParam("orgCode") String orgCode) {
JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode);
JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode, null);
Map<String, Object> result = Maps.newHashMap();
String url = deptInfo.getString("url");
result.put("url", url.endsWith("/") ? url.substring(0, url.length() - 1) : url);
@ -63,7 +63,7 @@ public class SysBaseInfoApi {
*/
@GetMapping("/getMediaUrlByOrgCode")
public Result<?> getMediaUrlByOrgCode(@RequestParam("orgCode") String orgCode) {
JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode);
JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode, null);
Map<String, Object> result = Maps.newHashMap();
String mediaUrl = deptInfo.getString("mediaUrl");
result.put("mediaUrl", mediaUrl.endsWith("/") ? mediaUrl : mediaUrl + "/");
@ -77,7 +77,7 @@ public class SysBaseInfoApi {
*/
@GetMapping("/getOrgApiAddress")
public Result<?> getOrgInfo(@RequestParam("orgCode") String orgCode) {
JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode);
JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode, null);
Map<String, Object> result = Maps.newHashMap();
String fullPath = "";
String url = deptInfo.getString("url");

2
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -194,7 +194,7 @@ public class ElderApi {
DynamicDataSourceContextHolder.push(orgCode);
JSONObject orgInfo = null;
try {
orgInfo = sysBaseAPI.getOrgInfo(orgCode);
orgInfo = sysBaseAPI.getOrgInfo(orgCode,"payable_amount");
} finally {
DynamicDataSourceContextHolder.clear();
}

2
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java
View File

@ -46,7 +46,7 @@ public class ElderTagServiceImpl extends ServiceImpl<ElderTagMapper, ElderTag> i
@DS("dataSourceCode")
@Override
public JSONObject getDeptInfo(String dataSourceCode, String orgCode) {
return sysBaseAPI.getOrgInfo(orgCode);
return sysBaseAPI.getOrgInfo(orgCode, null);
}
/**

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -546,7 +546,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
@DS("dataSourceCode")
@Override
public JSONObject getDeptInfo(String dataSourceCode, String orgCode) {
return sysBaseAPI.getOrgInfo(orgCode);
return sysBaseAPI.getOrgInfo(orgCode, null);
}
@Override

2
nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
View File

@ -625,7 +625,7 @@ public interface ISysBaseAPI extends CommonAPI {
JSONObject getOrgInfoByNuId(String nuId);
JSONObject getOrgInfo(String orgCode);
JSONObject getOrgInfo(String orgCode, String selectFileds);
JSONObject getDMOrgInfo();

46
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
View File

@ -718,13 +718,14 @@ public class SysBaseApiImpl implements ISysBaseAPI {
/**
* 不要改排序 排序固定用first_letter asc
*
* @param pid
* @return
*/
@Override
public List<SysCategoryModel> queryCategoryByPid(String pid) {
QueryWrapper<SysCategory> qw = new QueryWrapper<>();
qw.eq("pid",pid);
qw.eq("pid", pid);
//专门解决获取行政区排序问题的
qw.orderByAsc("first_letter");
List<SysCategory> list = categoryMapper.selectList(qw);
@ -1892,16 +1893,16 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public JSONObject getOrgInfoByNuId(String nuId) {
if(StringUtils.isBlank(nuId)){
if (StringUtils.isBlank(nuId)) {
return null;
}
String orgCode = nuId.substring(4, nuId.length()-3);
return queryOrgInfo(orgCode);
String orgCode = nuId.substring(4, nuId.length() - 3);
return queryOrgInfo(orgCode, null);
}
@Override
public JSONObject getOrgInfo(String orgCode) {
return queryOrgInfo(orgCode);
public JSONObject getOrgInfo(String orgCode, String selectFileds) {
return queryOrgInfo(orgCode, selectFileds);
}
@Override
@ -1934,31 +1935,34 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public JSONObject getDeptInfo() {
Map<String,Object> map = Maps.newHashMap();
Map<String, Object> map = Maps.newHashMap();
QueryWrapper<SysDepart> qw = new QueryWrapper<>();
qw.eq("org_category","1");
qw.eq("del_flag","0");
qw.eq("org_code","100");
qw.eq("org_category", "1");
qw.eq("del_flag", "0");
qw.eq("org_code", "100");
List<SysDepart> list = sysDepartService.list(qw);
if(list!=null && !list.isEmpty()){
map.put("code",list.get(0).getOrgCode());
map.put("name",list.get(0).getDepartName());
map.put("url",list.get(0).getUrl());
map.put("contextPath",list.get(0).getContextPath());
map.put("izDirectiveMain",list.get(0).getIzDirectiveMain());
map.put("izElderTagMain",list.get(0).getIzElderTagMain());
map.put("mediaUrl",list.get(0).getMediaUrl());
if (list != null && !list.isEmpty()) {
map.put("code", list.get(0).getOrgCode());
map.put("name", list.get(0).getDepartName());
map.put("url", list.get(0).getUrl());
map.put("contextPath", list.get(0).getContextPath());
map.put("izDirectiveMain", list.get(0).getIzDirectiveMain());
map.put("izElderTagMain", list.get(0).getIzElderTagMain());
map.put("mediaUrl", list.get(0).getMediaUrl());
}
return new JSONObject(map);
}
@Nullable
private JSONObject queryOrgInfo(String orgCode) {
private JSONObject queryOrgInfo(String orgCode, String selectFileds) {
QueryWrapper<SysDepart> qw = new QueryWrapper<>();
qw.eq("org_code", orgCode);//机构编码
qw.eq("org_category", "1");//机构类型
qw.eq("del_flag", "0");//未删除数据
if (StringUtils.isNotBlank(selectFileds)) {
qw.select(selectFileds.split(","));
}
SysDepart sysDepart = sysDepartService.getOne(qw);
if (sysDepart != null) {
return (JSONObject) JSONObject.toJSON(sysDepart);
@ -1970,7 +1974,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public Object queryAreaNameById(String id) {
QueryWrapper<SysCategory> qw = new QueryWrapper<>();
qw.eq("id",id);
qw.eq("id", id);
return categoryMapper.selectOne(qw);
}
@ -1986,7 +1990,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
public SysDepartModel selectDepartById(String id) {
SysDepart depart = sysDepartService.getDepartById(id);
SysDepartModel sysDepartModel = new SysDepartModel();
if(depart!=null){
if (depart != null) {
BeanUtils.copyProperties(depart, sysDepartModel);
}
return sysDepartModel;