diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index 3e267b0c..6b412a96 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -430,7 +430,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.dict_label as problemArea, COUNT(1) as roleType FROM - smz_ssp_problemmodify sp + vw_smz_ssp_problemmodify_audit sp left join sur_project p on p.id=sp.projectId left join sys_dict_data sd on sd.dict_value=sp.danger_type and sd.dict_type = 'ssp_aqyhlx' @@ -462,7 +462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ( select projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit - where infoType=#{infoType} AND isDel=0 + where infoType=#{infoType} AND isDel=0 AND progressVisible=0 and projectId=#{projectId} and proType = #{proType} AND deptid = #{deptId} @@ -481,7 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join( select projectid,count(1) timoutNoComp from vw_smz_ssp_problemmodify_audit where ((updateTime is null and date(nickedTime) < date(now()) ) or date(updateTime )>date(nickedTime)) - and infoType=#{infoType} AND isDel=0 + and infoType=#{infoType} AND isDel=0 AND progressVisible=0 and projectId=#{projectId} AND deptid = #{deptId} @@ -499,7 +499,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ( SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) < date(now()) ) - and infoType=#{infoType} AND isDel=0 + and infoType=#{infoType} AND isDel=0 AND progressVisible=0 and projectId=#{projectId} AND deptid = #{deptId} @@ -518,7 +518,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join( select projectid,count(1) comp from vw_smz_ssp_problemmodify_audit where checkState=4 - and infoType=#{infoType} AND isDel=0 + and infoType=#{infoType} AND isDel=0 AND progressVisible=0 and projectId=#{projectId} AND deptid = #{deptId}