From 7bff21359fa325c7d3f1049cbed6039903b8cadf Mon Sep 17 00:00:00 2001 From: gaoaoy <1042166043@qq.com> Date: 星期四, 29 二月 2024 13:48:03 +0800 Subject: [PATCH] 获取实验室列表 --- cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java | 10 ++++++++++ cnas-server/src/main/resources/mapper/LaboratoryMapper.xml | 16 ++++++++++++++++ cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java | 2 ++ cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java | 2 ++ cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 8 ++++++++ 5 files changed, 38 insertions(+), 0 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java index dfbecce..21982ae 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java @@ -52,5 +52,13 @@ public Result<?> upParameter(@RequestBody Laboratory itemParameter) { return Result.success(laboratoryService.upParameter(itemParameter)); } + + @ApiOperation(value = "鑾峰彇瀹為獙瀹ゅ悕绉�") + @PostMapping("/obtainItemParameterList") + public Result obtainItemParameterList(@RequestBody Map<String, Object> data) throws Exception { + Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); + Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class); + return Result.success(laboratoryService.obtainItemParameterList(page, itemParameter)); + } } diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java index 768de97..3e5eb66 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java @@ -12,5 +12,7 @@ public interface LaboratoryMapper extends BaseMapper<Laboratory> { IPage<Laboratory> selectItemParameter(Page page, QueryWrapper<Laboratory> ew); + + Object obtainItemParameterList(Page page, QueryWrapper<Laboratory> queryWrappers); } diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java index 07d903a..a386e9d 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java @@ -18,5 +18,7 @@ int delParameter(Integer id); int upParameter(Laboratory itemParameter); + + Map<String, Object> obtainItemParameterList(Page page, Laboratory itemParameter); } diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java index a62420a..086b6b2 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java @@ -49,5 +49,15 @@ public int upParameter(Laboratory itemParameter) { return laboratoryMapper.updateById(itemParameter); } + + @Override + public Map<String, Object> obtainItemParameterList(Page page, Laboratory itemParameter) { + Map<String, Object> map = new HashMap<>(); + map.put("head", PrintChina.printChina(Laboratory.class)); + Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("obtainItemParameterList"); + if(map1.get("look")==1) itemParameter.setCreateUser(map1.get("userId")); + map.put("body", laboratoryMapper.obtainItemParameterList(page, QueryWrappers.queryWrappers(itemParameter))); + return map; + } } diff --git a/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml b/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml index d4da968..a39d2cc 100644 --- a/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml +++ b/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml @@ -23,4 +23,20 @@ ${ew.customSqlSegment} </if> </select> + + <select id="obtainItemParameterList" resultType="java.lang.Object"> + select * from + ( + select l.id, + laboratory_name, + laboratory_number, + phone_number, + head, + address, + u1.name create_user_name, + l.create_time + from laboratory l + left join user u1 on l.create_user = u1.id + ) a + </select> </mapper> -- Gitblit v1.9.3