From c919ac59b5cc871a124f298663ecd365779e6bd4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 七月 2025 17:40:32 +0800
Subject: [PATCH] zjh20250728-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index bc1e067..e6a9048 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1819,20 +1819,26 @@
try {
if (StrUtil.isNotBlank(tjNum)) {
TjOrder one = orderService.getOrderByTjNum(tjNum);
-
+ List<Map<String, Object>> maps = new ArrayList<>();
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
yichangxiangmu(tjNum);
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if (null != list && !list.isEmpty()) {
- Collections.reverse(list);
- return getOrderYcxmList(list);
- } else {
+ List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum);
+ if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ Collections.reverse(list);
+ return getOrderYcxmList(list);
+ }else {
+ return AjaxResult.success(maps);
+ }
+ }else {
return zongjianyishengchakanyichangxiangmu(tjNum);
}
+
}
return AjaxResult.error();
} catch (Exception ex) {
@@ -2082,7 +2088,7 @@
}
} catch (Exception ex) {
- log.error(ex.getMessage());
+// log.error(ex.getMessage());
}
}
--
Gitblit v1.8.0