修改bug

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<NuBizSupplier
 														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														   HttpServletRequest req) {
 		 QueryWrapper<NuBizSuppliersApply> 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<NuBizSuppliersApply> page = new Page<NuBizSuppliersApply>(pageNo, pageSize);
 		 IPage<NuBizSuppliersApply> pageList = nuBizSuppliersApplyService.listPage(page, queryWrapper);
 		 return Result.OK(pageList);

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;
+
 }

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);

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<ElderInfoEntity> queryElderHisAudit(String openId);
+
+    ElderInfoEntity getElederInfo(String dataSourceCode,String idCard);
 }

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<ElderInfoMapper, ElderInfo
 
         return his;
     }
+
+    @Override
+    @DS("#dataSourceCode")
+    public ElderInfoEntity getElederInfo(String dataSourceCode,String idCard) {
+        QueryWrapper<ElderInfo> 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;
+    }
 }