From c2b7923a0b3c5aa88496238c9b4f362ead13fa5d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 09:00:01 +0800
Subject: [PATCH] zjh20241205-2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 8e13670..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
@@ -28,12 +28,12 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
@@ -98,13 +98,18 @@
@GetMapping("/newGetTjPat")
- @ApiOperation(value = "鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
+ @ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
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();
+ List<String> strings = orderService.selectTjOrderByCardId1();
+ if(null !=strings && strings.size()>0){
+ List<Map<String, Object>> collect = maps.stream()
+ .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList());
+ return AjaxResult.success(collect);
+ }
return AjaxResult.success(maps);
}
@@ -407,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