From a4be9d6bcba748ceab2c22150a2b67abad0a70ea Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 6 Mar 2026 11:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NuBizSuppliersApplyController.java | 2 ++ .../bizSuppliers/entity/NuBizSuppliersApply.java | 5 +++++ .../com/nu/modules/wechat/elder/api/ElderApi.java | 15 ++++++++++++--- .../com/nu/modules/elder/api/IElderInfoApi.java | 2 ++ .../service/impl/ElderInfoServiceImpl.java | 14 ++++++++++++++ 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java index 8ca602d..8c43b70 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java @@ -87,6 +87,8 @@ public class NuBizSuppliersApplyController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuBizSuppliersApply, req.getParameterMap()); + queryWrapper.like(StringUtils.isNotBlank(nuBizSuppliersApply.getRzrq()),"create_time",nuBizSuppliersApply.getRzrq()); + queryWrapper.apply(StringUtils.isNotBlank(nuBizSuppliersApply.getParamTitle()),"(suppliers_name like '%"+nuBizSuppliersApply.getParamTitle()+"%' or person_in_charge like '%"+nuBizSuppliersApply.getParamTitle()+"%' or contact_number like '%"+nuBizSuppliersApply.getParamTitle()+"%') "); Page page = new Page(pageNo, pageSize); IPage pageList = nuBizSuppliersApplyService.listPage(page, queryWrapper); return Result.OK(pageList); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java index abc3d97..e0213af 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java @@ -124,4 +124,9 @@ public class NuBizSuppliersApply implements Serializable { @TableField(exist = false) private String status; + @TableField(exist = false) + private String rzrq; + @TableField(exist = false) + private String paramTitle; + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index a550d5c..97f1222 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -306,7 +306,7 @@ public class ElderApi { @PostMapping("/addElder") public Result save(@RequestParam("ukey") String ukey, @RequestBody ElderInfoEntity elderInfoEntity) { if (NuRedisUtils.existKey(ukey)) { - return Result.ok("提交过于频繁，请稍后重试"); + return Result.error("提交过于频繁，请稍后重试"); } //长者id String id = elderInfoEntity.getSysOrgCode() + IdUtil.simpleUUID(); @@ -334,6 +334,10 @@ public class ElderApi { } } + ElderInfoEntity elderInfoEn1 = elderInfoApi.getElederInfo(elderInfoEntity.getOrgCode(),elderInfoEntity.getIdCard()); + if(elderInfoEn1!=null && StringUtils.isNotBlank(elderInfoEn1.getNuId())){ + return Result.error("此长者入住中，不可变更"); + } elderInfoEntity.setOrgCode(elderInfoEntity.getSysOrgCode()); elderInfoEntity.setCurrentState("1");//状态：入住 @@ -379,12 +383,17 @@ public class ElderApi { public Result updateElderInfo(@RequestParam("ukey") String ukey, @RequestBody ElderInfoEntity elderInfoEntity) { if (StringUtils.isNotBlank(elderInfoEntity.getId())) { if (!elderInfoApi.validateChanged(elderInfoEntity.getOrgCode(), elderInfoEntity)) { - return Result.ok("未做变更"); + return Result.error("当前无变更，无需提交"); } } if (NuRedisUtils.existKey(ukey)) { - return Result.ok("提交过于频繁，请稍后重试"); + return Result.error("提交过于频繁，请稍后重试"); } + ElderInfoEntity elderInfoEn = elderInfoApi.getElederInfo(elderInfoEntity.getOrgCode(),elderInfoEntity.getIdCard()); + if(elderInfoEn!=null && StringUtils.isNotBlank(elderInfoEn.getNuId()) && !StringUtils.equals(elderInfoEntity.getNuId(),elderInfoEn.getNuId())){ + return Result.error("此长者入住中，不可变更"); + } + elderInfoEntity.setOrgCode(elderInfoEntity.getOrgCode()); ElderInfoMQDto mqdto = new ElderInfoMQDto(); BeanUtils.copyProperties(elderInfoEntity, mqdto); diff --git a/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java b/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java index f03eb96..a310c9c 100644 --- a/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java +++ b/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java @@ -15,4 +15,6 @@ public interface IElderInfoApi { boolean validateChanged(String orgCode, ElderInfoEntity elderInfoEntity); List queryElderHisAudit(String openId); + + ElderInfoEntity getElederInfo(String dataSourceCode,String idCard); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index 05b5a5b..d916969 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -185,4 +185,18 @@ public class ElderInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id_card",idCard); + ElderInfo elderInfo = baseMapper.selectOne(queryWrapper); + if (elderInfo == null){ + return null; + } + ElderInfoEntity elderInfoEntity = new ElderInfoEntity(); + BeanUtils.copyProperties(elderInfo,elderInfoEntity); + return elderInfoEntity; + } }