From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 8 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 8e003c0..8dd0c2f 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
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ltkj.hosp.domain.TjProject;
@@ -65,14 +66,14 @@
      */
     public int deleteTjProjectByProIds(Long[] proIds);
 
-    @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0'")
+    @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted= 0 and pro_status=0")
     public List<TjProject> getTjProjectListBySoneId(@Param("proId") String proId);
 
     @Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND deleted='0'")
     public TjProject getTjProjectById(@Param("proId") String proId);
 
 
-    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
+    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0 ")
     String appendTjProjectName(String proId);
 
     @Select("SELECT a.pro_id FROM tj_project a WHERE a.dept_id=#{ksId}  AND a.pro_status=0 AND a.deleted='0' ")
@@ -88,13 +89,13 @@
     String appendTjProjectNames(@Param("proIds")String[] proIds);
 
 
-    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
+    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0")
     String getAllSonNames(String proId);
 
     @Select("SELECT GROUP_CONCAT(c.pro_name ) AS names FROM tj_package a LEFT JOIN tj_package_project b ON a.pac_id=b.pac_id LEFT JOIN tj_project c ON b.pro_id=c.pro_id  WHERE a.pac_id=#{pacId}")
     String getAllNamesByPacId(String pacId);
 
-    @Select("SELECT sum(pro_price) pro_price FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
+    @Select("SELECT sum(pro_price) pro_price FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0 ")
     BigDecimal getMoneys(String proId);
 
     @Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND pro_parent_id='0' AND deleted='0' ")
@@ -132,15 +133,18 @@
             ")) aa LEFT JOIN tj_project c ON aa.pro_id=c.pro_id  ")
     List<TjProject> getTjProListByPacIdAndDeptId(String pacId);
 
-    @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId}")
+    @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId} and pro_status=0")
     List<TjProject> getAllChildListById(String proId);
 
     @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0")
     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 deleted=0")
+    List<TjProject> getOpenDxTjProjectList(String nr);
 
 
     @Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
@@ -149,10 +153,10 @@
     List<TjProject> getPacTjProjectList();
 
 
-    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y'")
+    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y' and a.pro_status=0")
     List<Long> getHuaYanProId();
 
-    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y'")
+    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y' and a.pro_status=0")
     List<Long> getYingXiangProId();
 
 
@@ -162,4 +166,37 @@
 
     @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.dept_id in(269,270,253,254,255,257) AND a.need_report='Y'")
     List<Long> getNotCcCtXdtProId();
+
+    @Select("SELECT a.pro_id FROM tj_project a WHERE a.deleted=0 AND  a.need_report='N'")
+    List<Long> getNneedReprotProId();
+
+
+    @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);
+
+
+
+    List<Map<String,Object>> tjCsXmjgcx(Map<String,Object> map);
+
+
+    List<Map<String,Object>> getTjproGzJy(Map<String,Object> map);
+
+
+    List<List<?>> getTjHyBgList(Map<String,Object> map);
+
+
+//    @Select("SELECT #{sql}")
+    List<Map<String, Object>> zdysqlcx(Map<String,Object> map);
+
+    void zdysqlxg(Map<String,Object> map);
+
+    List<Map<String ,Object>> getLisViewList();
+
 }

--
Gitblit v1.8.0