From 14f9208da19b7030a1c65a40897f9f4146a74d44 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期五, 01 十一月 2024 08:37:14 +0800
Subject: [PATCH] 增加申请业务类型

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 3a5f1df..956d744 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -139,18 +139,11 @@
     List<TjProject> getTjProjectList();
 
 
-    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) ")
+    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) and deleted=0")
     List<TjProject> getDxTjProjectList();
 
-    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) AND LOCATE(#{pname},pro_name) OR LOCATE(#{pname},pro_eng_name)")
-    List<TjProject> getDxTjProjectList(String pname);
-
-    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0")
+    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and deleted=0")
     List<TjProject> getOpenDxTjProjectList();
-
-
-    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 AND LOCATE(#{pname},pro_name) OR LOCATE(#{pname},pro_eng_name)")
-    List<TjProject> getOpenDxTjProjectList(String pname);
 
 
     @Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
@@ -180,4 +173,10 @@
     @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proParentId} AND deleted='0' and pro_id in" +
             " (SELECT a.pro_id FROM tb_transition a WHERE a.tj_num=#{tjNumber}) ")
     List<TjProject> getTjProjectListByTbTransition(@Param("proParentId") String proParentId,@Param("tjNumber")String tjNumber);
+
+
+    @Select("SELECT b.tj_number FROM tj_order_remark b WHERE b.deleted=0 AND b.pro_id IN(\n" +
+            "\n" +
+            "SELECT a.pro_id FROM tj_project a WHERE a.deleted=0 AND a.pro_status=0 AND LOCATE(#{xmmc},a.pro_name) ) GROUP BY b.tj_number")
+    List<String> getTjNumLIstByXmmx(String xmmc);
 }

--
Gitblit v1.8.0