From edb81cb36ef2ff4560afdbe7918a747adbad998f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 29 二月 2024 10:58:26 +0800
Subject: [PATCH] zjh 本地 2024/02/29 -1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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 b8a9572..d6ec36f 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
@@ -67,7 +67,8 @@
boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
- @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type =1 AND deleted='0'")
+ @Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.tj_number=#{tjNumber}" +
+ " AND a.type =1 AND a.deleted=0 AND b.need_report='N' AND b.deleted=0")
List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
@@ -109,7 +110,7 @@
List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
-// @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
- @Select("select * from test_remark")
+ @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
+// @Select("select * from test_remark")
List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
}
--
Gitblit v1.8.0