From b4ac803e1554f70e556d94a1313d6944e5fc0e6f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 11 二月 2025 17:29:35 +0800
Subject: [PATCH] 去除非空返回错误
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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 f563a38..3f4bde8 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);
}
@@ -412,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("鍚屾鎴愬姛");
@@ -460,4 +454,13 @@
}
+ @GetMapping("/getWsxmLtkjHysqdByLisViBySLAVEWS")
+ @ApiOperation(value = "鏌ヨ澶栭�侀」鐩甋qlServer鎺ュ彛")
+ public AjaxResult getWsxmLtkjHysqdByLisViBySLAVEWS(@RequestParam String s) {
+// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisViBySLAVEWS(s);
+// log.info(wsbg.toString());
+ return AjaxResult.success(testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s));
+ }
+
+
}
--
Gitblit v1.8.0