diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
index b26a7857..27a65a12 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
@@ -106,7 +106,7 @@ public class ProblemmodifyController extends BaseController {
         if(obj!=null){
             return (List<SmzSspProblemmodify>) obj;
         }
-        List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSummaryByProject(deptId,roleType,0);
+        List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSummaryByProject(deptId,roleType,1);
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return list;
     }
@@ -122,7 +122,7 @@ public class ProblemmodifyController extends BaseController {
         List<SmzSspProblemmodify> list=smzSspProblemmodifyService.countByDateRange(where);
         return AjaxResult.success(list);
     }
-    @GetMapping("/groupByInfotypeCheckState")
+    @PostMapping("/groupByInfotypeCheckState")
     public AjaxResult groupByInfotypeCheckState(@RequestBody SmzSspProblemmodifyWhere where){
         List<SmzSspProblemmodify> list=smzSspProblemmodifyService.groupByInfotypeCheckState(where);
         return AjaxResult.success(list);
@@ -155,4 +155,8 @@ public class ProblemmodifyController extends BaseController {
         return AjaxResult.success(map);
     }
 
+    @PostMapping("/listSspProblemmodify")
+    public AjaxResult listSspProblemmodify(@RequestBody SmzSspProblemmodify where){
+        return  AjaxResult.success(smzSspProblemmodifyService.selectSmzSspProblemmodifyList(where));
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SmzProjectQuarterlyAssessController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SmzProjectQuarterlyAssessController.java
index 0861bd01..14abaa7d 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SmzProjectQuarterlyAssessController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SmzProjectQuarterlyAssessController.java
@@ -42,7 +42,7 @@ public class SmzProjectQuarterlyAssessController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SmzProjectQuarterlyAssess smzProjectQuarterlyAssess)
     {
-        startPage();
+        //startPage();
         List<SmzProjectQuarterlyAssess> list = smzProjectQuarterlyAssessService.selectSmzProjectQuarterlyAssessList(smzProjectQuarterlyAssess);
         return getDataTable(list);
     }
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 0da01c6e..8f39b232 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -214,21 +214,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON a.dict_value=b.danger_type ORDER BY cnt DESC,a.dict_value+0
     </select>
     <select id="selectSummaryByProject" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
-
-        SELECT a.*,b.cnt roleType FROM (
-                                  SELECT id,projectName problemArea FROM sur_project
-            where  isDel=0
-            <if test="id >0 ">AND deptid = #{id}</if>
-
-            ) a LEFT JOIN (
-
-            SELECT projectId,COUNT(1) cnt FROM smz_ssp_problemmodify WHERE projectId IN(
-            SELECT id FROM sur_project where  isDel=0
-            <if test="id >0 ">AND deptid = #{id}</if>
-                )
-                                                                       AND infotype=#{infoType} and isDel=0
+        select a.projectId,a.prjName projectName,a.proble id,if(b.timoutNoComp is null,0,b.timoutNoComp) infoType,if(c.timoutComp is null,0,c.timoutComp) checkState from
+        (
+        select  projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit
+        where infoType=#{infoType}
+        <if test="id >0 ">AND deptid = #{id}</if>
         <if test="roleType > 0">AND roletype=#{roleType}</if>
-            GROUP BY projectId ) b ON a.id=b.projectId ORDER BY cnt DESC,id LIMIT 0,10
+        group by projectId,prjName
+        )
+        a
+        left join(
+        select projectid,count(1) timoutNoComp  from vw_smz_ssp_problemmodify_audit where
+        (audittime is null and  date(nickedTime) &lt; date(now()) ) or  date(audittime)>date(nickedTime)
+        and infoType=#{infoType}
+        <if test="id >0 ">AND deptid = #{id}</if>
+        <if test="roleType > 0">AND roletype=#{roleType}</if>
+        group by projectId
+
+        ) b on a.projectId=b.projectId
+        left join (
+        SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE  DATE(audittime) &lt; DATE(nickedTime)
+        and infoType=#{infoType}
+        <if test="id >0 ">AND deptid = #{id}</if>
+        <if test="roleType > 0">AND roletype=#{roleType}</if>
+        GROUP BY projectid
+
+        ) c on a.projectId=c.projectId
+        order by a.proble desc
     </select>
 
     <select id="countByDate" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
@@ -242,10 +254,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         and DATE(createTime)=Date(#{startDate})
         GROUP BY infotype
+
     </select>
 
     <select id="countByDateRange" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
-        SELECT infotype,COUNT(1) id FROM smz_ssp_problemmodify WHERE isDel=0
+        SELECT infotype,COUNT(1) id FROM smz_ssp_problemmodify WHERE isDel=0  and infoType=#{infoType}
         <if test="projectId > 0"> and projectId=#{projectId}</if>
         <if test="projectId &lt;= 0">
         AND  projectId IN (