From 8b5f92972cf09ff0e52b5d15f44ba11e579a5928 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 六月 2025 16:27:16 +0800
Subject: [PATCH] 总价传递问题

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 064a64e..232b3b4 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
@@ -1462,7 +1462,11 @@
                                 } catch (NumberFormatException ignored) {
                                 }
                             } else {
-                                tjOrderDetail.setYcbz("");
+                                if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+                                    tjOrderDetail.setYcbz("");
+
+                                if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+                                    tjOrderDetail.setYcbz("鈫�");
                                 tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                             }
 
@@ -1708,6 +1712,7 @@
                                                         Object nr = maps.get("nr");
                                                         if (null != bt || null != nr) mapList.add(maps);
                                                     }
+
                                                 }
                                             }
                                             tjOrderDetail.setAdvices(mapList);
@@ -1928,4 +1933,12 @@
     }
 
 
+    @GetMapping("/zongjianyishengHuiFuyichangxiangmu")
+    @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎺ュ彛")
+    public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) {
+
+        List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum);
+        return AjaxResult.success(list);
+    }
+
 }

--
Gitblit v1.8.0