From 8cf225a3c519b49a2f62f4b627cec4002348082d Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期二, 30 一月 2024 08:27:07 +0800 Subject: [PATCH] zjh 本地 2024/01/30 -1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java index 8f87e6b..2402a43 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java @@ -12,7 +12,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.entity.SysDept; import com.ltkj.common.utils.bean.BeanUtils; +import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; +import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.hosp.service.*; import com.ltkj.hosp.treeUtil.TreeSelect; import com.ltkj.system.service.ISysConfigService; @@ -57,6 +59,20 @@ private DictProSfxmService dictProSfxmService; @Autowired private ITjRulesService tjRulesService; + @Resource + private TestMapper testMapper; + + + @GetMapping("/getTjHyBgList") + @ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�") + public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode, + @RequestParam(required = false)String pacName, + @RequestParam(required = false)String pacRemark) { + List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark); + DynamicDataSourceContextHolder.clearDataSourceType(); + return AjaxResult.success(maps); + } + /** * 鏌ヨ浣撴椤圭洰鍒楄〃 @@ -66,20 +82,6 @@ public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName, @RequestParam(required = false) @ApiParam(value = "妫�鏌ョ被鍒�") String checkType, @RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId) { -// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>(); -// wq0.eq(TjProject::getProParentId, 0); -// if(null !=proName){ -// wq0.like(TjProject::getProName,proName); -// } -// if(null !=checkType){ -// wq0.like(TjProject::getProCheckType,checkType); -// } -// if(null !=deptId){ -// wq0.like(TjProject::getDeptId,deptId); -// } -// -// List<TjProject> tjProjects = tjProjectService.list(wq0); - //涓婇潰鐨勬崲sql final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId); -- Gitblit v1.8.0