任务未开始开始中也计算工时，测试任务提出率修改为按照需求来

src/main/resources/mapper/ZtTaskMapper.xml

@@ -644,8 +644,12 @@
             #{id}
         </foreach>
         and (
-        (openedDate >= #{start} and s.openedDate <![CDATA[<=]]>  #{end})
+        (
+        s.status in ('wait','doing')  and s.deadline >= #{start}
+        and DATE_ADD(deadline, INTERVAL 1 DAY)    <![CDATA[<]]>   #{end}
+        )
         or
+
         ( finishedDate >= #{start} and s.finishedDate <![CDATA[<=]]>  #{end})
         )