From da9cb628948b381015faf188283a90a3aa15ce62 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期二, 10 十二月 2024 19:52:55 +0800 Subject: [PATCH] zjh202412010 --- ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 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 956d744..9fd9c27 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 @@ -65,14 +65,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 +88,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,7 +132,7 @@ ")) 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") @@ -152,10 +152,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(); -- Gitblit v1.8.0