From 76237bda249603e4863ee82a978de8af62a37e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 20 Apr 2023 15:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B4=A8=E5=88=86=E7=B1=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicHospTypeController.java | 10 ++++++++-- .../glxp/api/dao/basic/BasicHospTypeDao.java | 2 ++ .../req/basic/BasicHospTypeFilterRequest.java | 4 +++- .../service/basic/BasicHospTypeService.java | 2 ++ .../basic/impl/BasicHospTypeServiceImpl.java | 15 ++++++++++++++ .../mybatis/mapper/basic/BasicHospTypeDao.xml | 20 +++++++++++++++++++ 6 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java index f067a0fc..b6a9c6df 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java @@ -51,14 +51,20 @@ public class BasicHospTypeController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("/udiwms/basic/hosp/type/menuList") - public BaseResponse menuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) { + @PostMapping("/udiwms/basic/hosp/type/menuList") + public BaseResponse menuList(@RequestBody BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicHospTypeEntities = basicHospTypeService.getMenuList(basicHospTypeFilterRequest); + return ResultVOUtils.success(basicHospTypeEntities); + } + + @GetMapping("/udiwms/basic/hosp/type/getOneName") + public BaseResponse getOneName() { + BasicHospTypeEntity basicHospTypeEntities = basicHospTypeService.selectBasicHospTypeEntity(); return ResultVOUtils.success(basicHospTypeEntities); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java index 40ac9bb6..a2fbf15b 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java @@ -12,5 +12,7 @@ public interface BasicHospTypeDao extends BaseMapper { List getTreeList(); + List selectLowTypeAll(@Param("code") String code); + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java index 03edcedd..adf339bd 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java @@ -9,5 +9,7 @@ import java.util.List; @Data public class BasicHospTypeFilterRequest extends ListPageRequest { - private String name; + private String name; + private Integer type; + private String code; } diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java index a95866c0..2455c9a4 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java @@ -17,6 +17,8 @@ public interface BasicHospTypeService extends IService { List getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest); + BasicHospTypeEntity selectBasicHospTypeEntity(); + Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest); boolean updateBasicHospType(BasicHospTypeRequest basicHospTypeRequest); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 9f9a566e..1d5177ba 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) @@ -61,11 +62,25 @@ public class BasicHospTypeServiceImpl extends ServiceImpl getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) { + QueryWrapper ew=new QueryWrapper<>(); + ew.ne("code",10000); + if(basicHospTypeFilterRequest.getType()!=null && basicHospTypeFilterRequest.getType()==1 && StrUtil.isNotEmpty(basicHospTypeFilterRequest.getCode())){ + List basicHospTypeEntityList=basicHospTypeDao.selectLowTypeAll(basicHospTypeFilterRequest.getCode()); + List ids=basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList()); + ew.notIn("id",ids); + } List data = basicHospTypeDao.selectList(ew); return data; } + @Override + public BasicHospTypeEntity selectBasicHospTypeEntity() { + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",10000); + return basicHospTypeDao.selectOne(ew); + } + @Override public Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest) { boolean falg=true; diff --git a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml index d469b6cc..8ed12346 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml @@ -24,5 +24,25 @@ SELECT id, code,name as label,parentCode FROM basic_hosp_type ORDER BY id DESC + + \ No newline at end of file