From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 54 ++++++++++++++----------------------------------------
1 files changed, 14 insertions(+), 40 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..0ddb2b2 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
@@ -18,7 +18,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.ConvertingCursor;
import org.springframework.data.redis.core.Cursor;
@@ -45,13 +44,10 @@
public class TjSqlController extends BaseController {
@Resource
private TestMapper testMapper;
-
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
-
@Resource
private LtkjMiddleDetailService middleDetailService;
-
@Resource
private LtkjMiddleHeadService headService;
@Resource
@@ -62,16 +58,8 @@
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
- @Autowired
- public RedisTemplate<Object,Object> redisTemplate;
@Resource
private ITjCustomerService tjCustomerService;
- @Resource
- private RedisCache redisCache;
- @Resource
- private TjAsyncService asyncService;
- @Resource
- private ITjOrderRemarkService remarkService;
@Resource
private ITjOrderService orderService;
@Resource
@@ -84,16 +72,22 @@
private ITjOrderDetailService tjOrderDetailService;
@Resource
private ITjOrderRemarkService tjOrderRemarkService;
+ @Resource
+ private ITjProjectService projectService;
@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);
+ public AjaxResult getTjHyBgList(@RequestParam(defaultValue = "1")Integer page,
+ @RequestParam(defaultValue = "10")Integer pageSize,
+ @RequestParam(required = false)String pname,
+ @RequestParam(required = false)String pid,
+ @RequestParam(required = false)String pym,
+ @RequestParam(required = false)String checktype) {
+// List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ Map<String,Object> map= projectService.getTjHyBgList(page,pageSize,pname,pid,pym,checktype);
+ return AjaxResult.success(map);
}
@@ -101,28 +95,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 +105,6 @@
return AjaxResult.success(collect);
}
return AjaxResult.success(maps);
-// return AjaxResult.success(collect);
}
@@ -432,7 +406,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