diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index 4cf08955..32d0991e 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project_userinfo spu on spu.project_id = sp.id
- sp.isDel = 0
+ sp.isDel = 0 and sp.progressVisible=0
and sp.deptId like concat('%', #{deptId}, '%') and sp.projectName like concat('%', #{projectName}, '%') and sp.projectCode = #{projectCode}
@@ -286,9 +286,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,sum(c.money)
cnt FROM sur_project a, sys_dict_data b,sur_project_cost_output c WHERE b.dict_type='project_category' AND a.id=c.project_id AND c.cost_type=2 and c.year=#{isDel}
- AND a.projectType=b.dict_value and a.isDel=0
+ AND a.projectType=b.dict_value and a.isDel=0 and a.progressVisible=0
AND deptid=#{deptId}
- and projectType = #{proType}
+ and a.projectType = #{proType}
GROUP BY dict_value,dict_label
) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_category' ORDER BY cnt DESC
@@ -299,7 +299,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SUM(c.totalInvestment)COUNT(1)*10000
cnt FROM sur_project a, sys_dict_data b,vw_sur_project_cost_output c WHERE b.dict_type='project_category' AND a.id=c.project_id
- AND a.projectType=b.dict_value and a.isDel=0
+ AND a.projectType=b.dict_value and a.isDel=0 and a.progressVisible=0
AND deptid=#{deptId} and projectType = #{proType}
GROUP BY dict_value,dict_label
@@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,sum(c.money) cnt
FROM sur_project a,sys_dict_data b ,sur_project_cost_output c WHERE b.dict_type='project_level' AND a.id=c.project_id AND c.cost_type=2 and c.year=#{isDel}
- AND a.projiectLevel=b.dict_value and a.isDel=0
+ AND a.projiectLevel=b.dict_value and a.isDel=0 and a.progressVisible=0
AND deptid=#{deptId} and projectType = #{proType}
GROUP BY dict_value,dict_label
@@ -325,7 +325,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SUM(c.totalInvestment)
cnt FROM sur_project a, sys_dict_data b ,vw_sur_project_cost_output c WHERE b.dict_type='project_level' AND a.id=c.project_id
- AND a.projiectLevel=b.dict_value and a.isDel=0
+ AND a.projiectLevel=b.dict_value and a.isDel=0 and a.progressVisible=0
AND deptid=#{deptId} and projectType = #{proType}
GROUP BY dict_value,dict_label
@@ -369,8 +369,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"