From a0dde8aa21d8bc2b55ccbb2278fc730f75f7ef8b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 08:55:13 +0800
Subject: [PATCH] zjh20250718
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 0adee6c..081d0c2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2949,10 +2949,12 @@
for (TbTransition tbTransition : list) {
if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
JSONObject obj = JSONUtil.createObj();
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, tbTransition.getParentProId().toString());
obj.putOpt("index", index++);
obj.putOpt("parent_pro_name", tbTransition.getParentProName());
obj.putOpt("price", tbTransition.getOrdPrice());
obj.putOpt("ks", dept.getDeptName());
+ if(null !=remark) obj.putOpt("sfzt", remark.getSfbz());
huiZong.add(obj);
}
}
--
Gitblit v1.8.0