From 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 23 一月 2025 17:07:51 +0800
Subject: [PATCH] zjh20250123

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 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 a4e6d8e..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);
     }
 
 

--
Gitblit v1.8.0