From 623aaa8471d6d7adf1cb9ee584fc20da6c26f603 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 18:03:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 3e22a89..8fac456 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -76,12 +76,23 @@
@Resource
private ISysDeptService deptService;
+ @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);
+ }
+
@GetMapping("/newGetTjPat")
@ApiOperation(value = "鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
@RequestParam(required = false)String pacRemark) {
+// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
return AjaxResult.success(maps);
--
Gitblit v1.8.0