From 148a7f11b0ead8539cae824f02dda19a703f4d0b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 07 十二月 2024 16:54:02 +0800
Subject: [PATCH] zjh20241207
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 24 ++----------------------
1 files changed, 2 insertions(+), 22 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 4794803..a4e6d8e 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
@@ -101,28 +101,9 @@
@ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark, HttpServletRequest request,
- HttpSession session) {
-
-// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
+ @RequestParam(required = false)String pacRemark) {
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
-// List<Map<String, Object>> list=new ArrayList<>();
-// if(null !=maps && maps.size()>0){
-// for (Map<String, Object> map : maps) {
-// String pacCode1 = map.get("pacCode").toString();
-// List<String> s = orderService.selectTjOrderByCardId1();
-// if(null !=s && s.size()>0){
-// if(s.contains(pacCode1)){
-//// maps.remove(map);
-// continue;
-// }
-// list.add(map);
-// }
-// }
-// }
-// return AjaxResult.success(list);
-
List<String> strings = orderService.selectTjOrderByCardId1();
if(null !=strings && strings.size()>0){
List<Map<String, Object>> collect = maps.stream()
@@ -130,7 +111,6 @@
return AjaxResult.success(collect);
}
return AjaxResult.success(maps);
-// return AjaxResult.success(collect);
}
@@ -432,7 +412,7 @@
//鍚屾鍖栭獙椤圭洰
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(), "1");
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
}
// }
return AjaxResult.success("鍚屾鎴愬姛");
--
Gitblit v1.8.0