安检单提交修改隐患、未安检人统计、安检任务隐患统计修改

huaxin-system/src/main/resources/mapper/system/TDangerMapper.xml

@@ -294,7 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </delete>
     <update id="updateByInspect">
-        UPDATE t_danger SET status = 0
+        UPDATE t_danger SET STATUS = IF(ISNULL(reform_id),0,3)
         WHERE inspect_id =#{inspectId}
         <if test="type &gt; 3">
             and `type` = #{type}

huaxin-system/src/main/resources/mapper/system/TTaskMapper.xml

@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 COUNT(p.id) AS isjian,
             </if>
             CASE t.type
-                WHEN 1 THEN (SELECT COUNT(us.id) FROM t_user us WHERE us.task_type = t.task_type)
+                WHEN 1 THEN (SELECT COUNT(us.id) FROM t_user us WHERE us.task_type = t.task_type and us.village in (SELECT re.relation_id FROM t_task_relation_info re WHERE re.task_id = t.id and re.type = '1' ))
                 WHEN 2 THEN (SELECT COUNT(id) FROM t_business)
                 ELSE (SELECT COUNT(id) FROM t_industry)
             END AS allnum
@@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
           count(1)AS totalDangerNum,
           SUM(IF(danger.status=0,1,0))AS toDoNum,
-          SUM(IF(danger.status=2,1,0))AS dealNum
+          SUM(IF(danger.status>2,1,0))AS dealNum
         FROM
             t_task_inspect inspect,t_danger danger
         <where>