From e784e427c44cb20d58e29afbb460cfe45b07c712 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 27 Feb 2026 14:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=9C=AA=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=88=90=E5=89=8D=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgapplyinfo/entity/OrgAllInfoApiEntity.java | 5 +++++ .../service/impl/OrgApplyInfoServiceImpl.java | 10 ++++++++++ .../modules/system/controller/LoginController.java | 6 ++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java index ae08b3a..db16606 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java @@ -374,4 +374,9 @@ public class OrgAllInfoApiEntity implements Serializable { */ private java.lang.String passwordText; + /** + * 平台是否搭建完成 Y完成 N未完成 + */ + private String platformBuildComplete; + } 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 91b6a36..d6aea67 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 @@ -191,6 +191,8 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl queryOrgHomePageList(String openId) { + //只有入驻审批通过后的才会进sys_depart 刚审核完成直到走完搭建流程 sys_depart的status都是0 运维走完搭建流程 最后一步（反馈）后 status才会变成1 + //已经申请通过的机构 查这个表是因为需要最新的机构数据 apply的数据可能是变更中的数据 SysDepartEntity queryParams = new SysDepartEntity(); queryParams.setOpenId(openId); @@ -198,6 +200,11 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl { item.setPkId(item.getId()); + if ("0".equals(item.getStatus())) { + item.setPlatformBuildComplete("N"); + } else { + item.setPlatformBuildComplete("Y"); + } item.setStatus("2"); }); } @@ -209,6 +216,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl applyList = BeanUtil.copyToList(baseMapper.selectList(qw), OrgAllInfoApiEntity.class); + applyList.stream().forEach(item -> { + item.setPlatformBuildComplete("N"); + }); orgApplyInfoApiEntities.addAll(applyList); for (OrgAllInfoApiEntity par : orgApplyInfoApiEntities) { 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 4e590e8..98e8c3c 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 @@ -1018,8 +1018,10 @@ public class LoginController { System.out.println("openId = " + openId); queryWrapper.eq("open_id", openId); AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getOne(queryWrapper); - nuBizAdvisoryInfo.setTel(phone); - nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo); + AdvisoryInfo updateDate = new AdvisoryInfo(); + updateDate.setId(nuBizAdvisoryInfo.getId()); + updateDate.setTel(phone); + nuBizAdvisoryInfoService.updateById(updateDate); return result; }