From 4a09cfb609e8d155c156f8c44fa539e9f2151ce9 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 20 Oct 2025 09:36:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E5=8A=A0=E7=9B=9F-=E7=94=B3=E8=AF=B7=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E5=86=8D=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=EF=BC=9A=E6=97=A0=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=97=A0=E9=9C=80=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrgApplyInfoServiceImpl.java | 13 ++++++++++++- .../wxnotice/service/impl/WxNoticeServiceImpl.java | 2 +- .../wechat/orgapplyinfo/api/OrgApplyInfoApi.java | 10 +++++----- 3 files changed, 18 insertions(+), 7 deletions(-) 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 1ffd5b1..a9773ac 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 @@ -402,8 +402,19 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("pk_id", orgApplyInfoApiEntity.getPkId()); - qw.eq("status", "2"); + if ("1".equals(orgApplyInfoApiEntity.getStatus())) { + qw.eq("status", "3"); + } else if ("4".equals(orgApplyInfoApiEntity.getStatus())) { + qw.eq("status", "2"); + } else { + qw.eq("status", "-1314"); + } OrgApplyInfo dbRecord = baseMapper.selectOne(qw); + if ("1".equals(orgApplyInfoApiEntity.getStatus())) { + if (dbRecord == null) { + return true; + } + } OrgApplyInfo inputRecord = new OrgApplyInfo(); BeanUtils.copyProperties(orgApplyInfoApiEntity, inputRecord); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java index d2d471d..c74c02a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java @@ -71,7 +71,7 @@ public class WxNoticeServiceImpl extends ServiceImpl i qw.select("id"); qw.eq("open_id", openId); qw.eq("iz_read", "1"); - qw.eq("client_type", clientType);//哪个端(机构?员工？家属？) + qw.eq("client_type", clientType);//哪个端(1机构2员工3家属) List wxNotices = baseMapper.selectList(qw); return wxNotices == null ? 0 : wxNotices.size(); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index e70d299..5e6bf19 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -31,14 +31,14 @@ public class OrgApplyInfoApi { */ @AutoLog(value = "新增/编辑机构加盟申请信息") @PostMapping("/save") - public Result save(@RequestParam("ukey") String ukey,@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { + public Result save(@RequestParam("ukey") String ukey, @RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { //变更信息时 验证是否有变化 没有变化不允许提交 - if ("4".equals(orgApplyInfoApiEntity.getStatus())) { - if(!orgApplyInfoApi.validateChanged(orgApplyInfoApiEntity)){ + if ("1".equals(orgApplyInfoApiEntity.getStatus()) || "4".equals(orgApplyInfoApiEntity.getStatus())) { + if (!orgApplyInfoApi.validateChanged(orgApplyInfoApiEntity)) { return Result.ok("未做变更"); } } - if(NuRedisUtils.existKey(ukey)){ + if (NuRedisUtils.existKey(ukey)) { return Result.ok("重复提交"); } System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------" + orgApplyInfoApiEntity.getTel()); @@ -73,7 +73,7 @@ public class OrgApplyInfoApi { if (StringUtils.isBlank(openId)) { return Result.error("未填写openId"); } - return Result.ok(orgApplyInfoApi.queryAuditInfo(openId, id,status)); + return Result.ok(orgApplyInfoApi.queryAuditInfo(openId, id, status)); } }