diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml
index f4ecfbe..568509e 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml
@@ -23,7 +23,7 @@
- and o.com_name like concat('%',#{title},'%')
+ and d.depart_name like concat('%',#{title},'%')
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
index dcf310c..3610705 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
@@ -194,7 +194,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl orgApplyInfoApiEntities = BeanUtil.copyToList(sysBaseAPI.queryAllAuditPassOrg(queryParams), OrgAllInfoApiEntity.class);
+ List orgApplyInfoApiEntities = BeanUtil.copyToList(sysBaseAPI.queryAllOrgInfo(queryParams), OrgAllInfoApiEntity.class);
if (!CollectionUtils.isEmpty(orgApplyInfoApiEntities)) {
orgApplyInfoApiEntities.stream().forEach(item -> {
item.setPkId(item.getId());
@@ -385,7 +385,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl implements IElderInfoService, IElderInfoApi {
@Autowired
- private INuBaseInfoApi nuBaseInfoApi;
+ private ISysBaseAPI sysBaseAPI;
@Autowired
private INuBaseElderService baseElderService;
@@ -136,8 +135,8 @@ public class ElderInfoServiceImpl extends ServiceImpl sysDepartList = sysBaseAPI.queryAllOrgInfo(queryParams);
List his = Lists.newArrayList();
for (String orgCode : orgCodes) {
@@ -159,6 +158,31 @@ public class ElderInfoServiceImpl extends ServiceImpl orgInfoMap = sysDepartList.stream()
+ .filter(Objects::nonNull)
+ .filter(depart -> StringUtils.isNotBlank(depart.getOrgCode()))
+ .collect(Collectors.toMap(
+ SysDepartEntity::getOrgCode,
+ depart -> depart
+ ));
+
+ // 补充his数据中的机构负责人和负责人电话
+ if (!CollectionUtils.isEmpty(his) && !CollectionUtils.isEmpty(sysDepartList)) {
+ for (ElderInfoEntity elderInfo : his) {
+ if (StringUtils.isNotBlank(elderInfo.getSysOrgCode())) {
+ SysDepartEntity departEntity = orgInfoMap.get(elderInfo.getSysOrgCode());
+ if (departEntity != null) {
+ // 设置机构负责人 (对应SysDepartEntity的orgLeader字段)
+ elderInfo.setDepartFzr(departEntity.getOrgLeader());
+ // 设置机构负责人电话 (对应SysDepartEntity的orgLeaderPhone字段)
+ elderInfo.setDepartPhone(departEntity.getOrgLeaderPhone());
+ }
+ }
+ }
+ }
+
return his;
}
}
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java
index 1873070..611b80f 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java
@@ -173,7 +173,7 @@ public class ElderTaggMQListener {
nuWxNotice.setIzRead("N");
nuWxNotice.setOrgCode(dto.getOrgCode());
nuWxNotice.setTitle("监护人信息变更审批");
- nuWxNotice.setContent("您好,您提交的" + dto.getName() + "长者的监护人信息变更申请未通过");
+ nuWxNotice.setContent("您好,您提交的" + dto.getName() + "长者的监护人信息变更申请未通过,驳回原因:" + dto.getAuditContent());
nuWxNotice.setType("elder_jhr_info_update_list");
Map extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode());
@@ -200,7 +200,7 @@ public class ElderTaggMQListener {
nuWxNotice.setIzRead("N");
nuWxNotice.setOrgCode(dto.getOrgCode());
nuWxNotice.setTitle("长者信息变更审批");
- nuWxNotice.setContent("您好,您提交的" + dto.getName() + "长者信息变更申请未通过");
+ nuWxNotice.setContent("您好,您提交的" + dto.getName() + "长者信息变更申请未通过,驳回原因:" + dto.getAuditContent());
nuWxNotice.setType("elder_info_update_list");
Map extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode());
diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index 082bccf..2d7d9d8 100644
--- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -643,7 +643,7 @@ public interface ISysBaseAPI extends CommonAPI {
*/
SysDepartEntity selectDepartById(String id);
- List queryAllAuditPassOrg(SysDepartEntity queryParams);
+ List queryAllOrgInfo(SysDepartEntity queryParams);
void updateById(SysDepartEntity sysDepartEntity);
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
index 49f5e33..1c76750 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
@@ -245,5 +245,5 @@ public interface ISysDepartService extends IService{
void changeElderTagMain(String orgCode);
- List queryAllAuditPassOrg(SysDepartEntity queryParams);
+ List queryAllOrgInfo(SysDepartEntity queryParams);
}
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 d55c43b..9e10a04 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
@@ -1981,8 +1981,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
}
@Override
- public List queryAllAuditPassOrg(SysDepartEntity queryParams){
- return sysDepartService.queryAllAuditPassOrg(queryParams);
+ public List queryAllOrgInfo(SysDepartEntity queryParams){
+ return sysDepartService.queryAllOrgInfo(queryParams);
}
@Override
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index 63e394c..e0012b4 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -1415,11 +1415,14 @@ public class SysDepartServiceImpl extends ServiceImpl queryAllAuditPassOrg(SysDepartEntity queryParams) {
+ public List queryAllOrgInfo(SysDepartEntity queryParams) {
QueryWrapper qw = new QueryWrapper<>();
qw.eq("org_category", "1");
qw.eq("org_type", "1");
qw.eq("del_flag", "0");
+ if (StringUtils.isNotBlank(queryParams.getStatus())) {
+ qw.eq("status", queryParams.getStatus());
+ }
if (StringUtils.isNotBlank(queryParams.getOpenId())) {
qw.eq("open_id", queryParams.getOpenId());
}