修改长者信息接口:增加入参- 长者id 可用于查询长者/监护人详情
This commit is contained in:
parent
1c5d9d1b33
commit
18a791f6fd
|
|
@ -8,7 +8,7 @@ import java.util.List;
|
||||||
|
|
||||||
public interface INuBaseElderApi {
|
public interface INuBaseElderApi {
|
||||||
|
|
||||||
List<NuBaseElderEntity> queryByOpenId(String openId);
|
List<NuBaseElderEntity> queryByOpenId(String openId, String elderId);
|
||||||
|
|
||||||
void bindnu(NuBaseInfoEntity nuBaseInfoEntity);
|
void bindnu(NuBaseInfoEntity nuBaseInfoEntity);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import com.nu.modules.nubaseelder.entity.NuBaseElder;
|
||||||
import com.nu.modules.nubaseelder.mapper.NuBaseElderMapper;
|
import com.nu.modules.nubaseelder.mapper.NuBaseElderMapper;
|
||||||
import com.nu.modules.nubaseelder.service.INuBaseElderService;
|
import com.nu.modules.nubaseelder.service.INuBaseElderService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
@ -59,7 +60,6 @@ public class NuBaseElderServiceImpl extends ServiceImpl<NuBaseElderMapper, NuBas
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addelder(NuBaseElderMQDto dto) {
|
public void addelder(NuBaseElderMQDto dto) {
|
||||||
UpdateWrapper<NuBaseElder> uw = new UpdateWrapper<>();
|
UpdateWrapper<NuBaseElder> uw = new UpdateWrapper<>();
|
||||||
|
|
@ -71,9 +71,12 @@ public class NuBaseElderServiceImpl extends ServiceImpl<NuBaseElderMapper, NuBas
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<NuBaseElderEntity> queryByOpenId(String openId) {
|
public List<NuBaseElderEntity> queryByOpenId(String openId, String elderId) {
|
||||||
QueryWrapper<NuBaseElder> qw = new QueryWrapper<>();
|
QueryWrapper<NuBaseElder> qw = new QueryWrapper<>();
|
||||||
qw.eq("open_id", openId);
|
qw.eq("open_id", openId);
|
||||||
|
if (StringUtils.isNotBlank(elderId)) {
|
||||||
|
qw.eq("elder_id",elderId);
|
||||||
|
}
|
||||||
List<NuBaseElder> list = baseMapper.selectList(qw);
|
List<NuBaseElder> list = baseMapper.selectList(qw);
|
||||||
return BeanUtil.copyToList(list, NuBaseElderEntity.class);
|
return BeanUtil.copyToList(list, NuBaseElderEntity.class);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ public class ElderApi {
|
||||||
advisoryInfoApi.editNuBizAdvisoryInfo(nuBizAdvisoryInfo);
|
advisoryInfoApi.editNuBizAdvisoryInfo(nuBizAdvisoryInfo);
|
||||||
//通知对应机构修改老人家属信息
|
//通知对应机构修改老人家属信息
|
||||||
//护理单元信息
|
//护理单元信息
|
||||||
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(nuBizAdvisoryInfo.getOpenId());
|
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(nuBizAdvisoryInfo.getOpenId(), null);
|
||||||
if (nuElderList != null && nuElderList.size() > 0) {
|
if (nuElderList != null && nuElderList.size() > 0) {
|
||||||
//查询出机构编码 - 机构名称对应关系
|
//查询出机构编码 - 机构名称对应关系
|
||||||
List<JSONObject> jsonObjects = sysBaseAPI.queryOpeDept();
|
List<JSONObject> jsonObjects = sysBaseAPI.queryOpeDept();
|
||||||
|
|
@ -216,10 +216,10 @@ public class ElderApi {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/queryElders")
|
@GetMapping("/queryElders")
|
||||||
public Result<List<ElderInfoEntity>> queryElders(@RequestParam("openId") String openId) {
|
public Result<List<ElderInfoEntity>> queryElders(@RequestParam("openId") String openId, @RequestParam("elderId") String elderId) {
|
||||||
|
|
||||||
//护理单元信息
|
//护理单元信息
|
||||||
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId);
|
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, elderId);
|
||||||
if (nuElderList == null || nuElderList.size() == 0) {
|
if (nuElderList == null || nuElderList.size() == 0) {
|
||||||
return Result.ok(List.of());
|
return Result.ok(List.of());
|
||||||
}
|
}
|
||||||
|
|
@ -249,7 +249,7 @@ public class ElderApi {
|
||||||
String orgCode = entry.getKey();
|
String orgCode = entry.getKey();
|
||||||
//切换数据源整理好数据放到返回结果中
|
//切换数据源整理好数据放到返回结果中
|
||||||
DynamicDataSourceContextHolder.push(orgCode);
|
DynamicDataSourceContextHolder.push(orgCode);
|
||||||
List<ElderInfoEntity> list = elderInfoApi.queryElders(openId);
|
List<ElderInfoEntity> list = elderInfoApi.queryElders(openId, elderId);
|
||||||
result.addAll(list);
|
result.addAll(list);
|
||||||
DynamicDataSourceContextHolder.clear();
|
DynamicDataSourceContextHolder.clear();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ public class NuBaseInfoApi {
|
||||||
@GetMapping("/queryBillList")
|
@GetMapping("/queryBillList")
|
||||||
public Result<List<NuBillEntity>> queryBillList(@RequestParam("openId") String openId) {
|
public Result<List<NuBillEntity>> queryBillList(@RequestParam("openId") String openId) {
|
||||||
//护理单元信息
|
//护理单元信息
|
||||||
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId);
|
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, null);
|
||||||
if (nuElderList == null || nuElderList.size() == 0) {
|
if (nuElderList == null || nuElderList.size() == 0) {
|
||||||
return Result.ok(List.of());
|
return Result.ok(List.of());
|
||||||
}
|
}
|
||||||
|
|
@ -116,7 +116,7 @@ public class NuBaseInfoApi {
|
||||||
@GetMapping("/elderHomeList")
|
@GetMapping("/elderHomeList")
|
||||||
public Result<List<NuBaseInfoEntity>> elderHomeList(@RequestParam("openId") String openId) {
|
public Result<List<NuBaseInfoEntity>> elderHomeList(@RequestParam("openId") String openId) {
|
||||||
//护理单元信息
|
//护理单元信息
|
||||||
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId);
|
List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, null);
|
||||||
if (nuElderList == null || nuElderList.size() == 0) {
|
if (nuElderList == null || nuElderList.size() == 0) {
|
||||||
return Result.ok(List.of());
|
return Result.ok(List.of());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,5 @@ public interface IElderInfoApi {
|
||||||
|
|
||||||
List<ElderInfoEntity> queryByElderIds(String[] split);
|
List<ElderInfoEntity> queryByElderIds(String[] split);
|
||||||
|
|
||||||
List<ElderInfoEntity> queryElders(String openId);
|
List<ElderInfoEntity> queryElders(String openId, String elderId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import com.nu.modules.elder.api.IElderInfoApi;
|
||||||
import com.nu.modules.elderinfo.entity.ElderInfo;
|
import com.nu.modules.elderinfo.entity.ElderInfo;
|
||||||
import com.nu.modules.elderinfo.mapper.ElderInfoMapper;
|
import com.nu.modules.elderinfo.mapper.ElderInfoMapper;
|
||||||
import com.nu.modules.elderinfo.service.IElderInfoService;
|
import com.nu.modules.elderinfo.service.IElderInfoService;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
|
@ -29,15 +30,18 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
|
||||||
public List<ElderInfoEntity> queryByElderIds(String[] ids) {
|
public List<ElderInfoEntity> queryByElderIds(String[] ids) {
|
||||||
QueryWrapper<ElderInfo> qw = new QueryWrapper<>();
|
QueryWrapper<ElderInfo> qw = new QueryWrapper<>();
|
||||||
qw.in("id", ids);
|
qw.in("id", ids);
|
||||||
return BeanUtil.copyToList(baseMapper.selectList(qw),ElderInfoEntity.class);
|
return BeanUtil.copyToList(baseMapper.selectList(qw), ElderInfoEntity.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ElderInfoEntity> queryElders(String openId) {
|
public List<ElderInfoEntity> queryElders(String openId, String elderId) {
|
||||||
QueryWrapper<ElderInfo> qw = new QueryWrapper<>();
|
QueryWrapper<ElderInfo> qw = new QueryWrapper<>();
|
||||||
qw.eq("guardian_open_id",openId);
|
qw.eq("guardian_open_id", openId);
|
||||||
|
if(StringUtils.isNotBlank(elderId)){
|
||||||
|
qw.eq("id",elderId);
|
||||||
|
}
|
||||||
List<ElderInfo> elderInfos = baseMapper.selectList(qw);
|
List<ElderInfo> elderInfos = baseMapper.selectList(qw);
|
||||||
return BeanUtil.copyToList(elderInfos,ElderInfoEntity.class);
|
return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue