From 62eb109ad2041c38df8f48d41b95a85d2dc44cb7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 七月 2025 17:56:12 +0800
Subject: [PATCH] zjh20250715-2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 ++
2 files changed, 3 insertions(+), 1 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 288687b..30e626a 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
@@ -2923,10 +2923,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);
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index cc747d2..ffbfa95 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -26,7 +26,7 @@
@Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND deleted='0'")
List<TjOrderRemark> getTjOrderRemarkListByTjNum(String tjNumber);
- @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
+ @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted=0 ")
TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber, @Param("proParentId") String proParentId);
@Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")
--
Gitblit v1.8.0