From 88455df02d78b850df5a73c6fe3795c0dddaa3c4 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 01 二月 2024 14:39:01 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 0d20f6b..00c6fae 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
@@ -106,19 +106,29 @@
@Select("SELECT DISTINCT d.* from (\n" +
"\tSELECT * FROM `tj_project` a\n" +
- "\twhere a.pro_parent_id=0 \n" +
+ "\twhere a.pro_parent_id=0 and a.deleted=0 \n" +
"\tand (case WHEN #{proName} is NOt NULL THEN a.pro_name like concat('%',#{proName},'%') ELSE 1=1 END)\n" +
"\tand (case WHEN #{checkType} is NOt NULL THEN a.pro_check_type=#{checkType} ELSE 1=1 END)\n" +
"\tand (case WHEN #{deptId} is NOt NULL THEN a.dept_id=#{deptId} ELSE 1=1 END)\n" +
"UNION \n" +
"\tSELECT b.* FROM `tj_project` b JOIN(\n" +
"\tSELECT * FROM `tj_project` a\n" +
- "\twhere a.pro_parent_id!=0\n" +
+ "\twhere a.pro_parent_id!=0 and a.deleted=0\n" +
"\tand (case WHEN #{proName} is NOt NULL THEN a.pro_name like concat('%',#{proName},'%') ELSE 1=1 END)\n" +
"\tand (case WHEN #{checkType} is NOt NULL THEN a.pro_check_type=#{checkType} ELSE 1=1 END)\n" +
"\tand (case WHEN #{deptId} is NOt NULL THEN a.dept_id=#{deptId} ELSE 1=1 END)\n" +
") c\n" +
- "on c.pro_parent_id=b.pro_id\n" +
+ "on c.pro_parent_id=b.pro_id WHERE c.pro_parent_id=b.pro_id AND " +
+ "(case WHEN #{deptId} is NOt NULL THEN b.dept_id=#{deptId} ELSE 1=1 END)\n" +
") d\n")
List<TjProject> getProBySqlAndName(@Param("proName")String proName,@Param("checkType")String checkType,@Param("deptId")String deptId);
+
+
+
+ @Select("SELECT * FROM (\n" +
+ "SELECT * FROM tj_package_project a WHERE a.pac_id=#{pacId} AND a.pro_id IN\n" +
+ "(\n" +
+ " SELECT b.pro_id FROM tj_project b WHERE b.pro_parent_id=0 AND b.dept_id='259'\n" +
+ ")) aa LEFT JOIN tj_project c ON aa.pro_id=c.pro_id ")
+ List<TjProject> getTjProListByPacIdAndDeptId(String pacId);
}
--
Gitblit v1.8.0