From b83df5a43c563bac919dee41d3a8b794f22f1030 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 19:20:45 +0800
Subject: [PATCH] zjh202412013

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 32862d7..e406c81 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -235,8 +235,23 @@
 
 
 
+//    @Select("SELECT a.* FROM tj_order_detail a LEFT JOIN tj_project b ON a.pro_id=b.pro_id \n" +
+//            "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id \n" +
+//            " WHERE a.deleted=0 AND !ISNULL(a.flowing_water_id) AND a.order_id=#{orderId} and b.pro_parent_id = 0 AND c.org_type=1")
     @Select("SELECT a.* FROM tj_order_detail a LEFT JOIN tj_project b ON a.pro_id=b.pro_id \n" +
-            "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id AND c.org_type=1\n" +
-            " WHERE a.deleted=0 AND !ISNULL(a.flowing_water_id) AND a.order_id=#{orderId} and b.pro_parent_id = 0")
+            "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id \n" +
+            " WHERE a.deleted=0 AND a.order_id=#{orderId} and b.pro_parent_id = 0 AND c.org_type=1")
     List<TjOrderDetail> getCaiYangDengJi(Long orderId);
+
+    @Select("SELECT a.* FROM tj_order_detail a LEFT JOIN tj_project b ON a.pro_id=b.pro_id \n" +
+            "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id \n" +
+            " WHERE a.deleted=0 AND a.order_id=#{orderId} and b.pro_parent_id = 0 AND c.org_type=1 AND a.jxbz = #{jxbz}")
+    List<TjOrderDetail> getCaiYangDengJiJxbz(@Param("orderId") Long orderId,@Param("jxbz") String jxbz);
+
+
+    @Select("call tj_check_yclist(1,#{tjnumber,mode=IN})")
+    List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
+
+    @Select("call tj_check_yclist(4,#{tjNumber,mode=IN})")
+    List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu4(@Param("tjNumber") String tjNumber);
 }

--
Gitblit v1.8.0