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

src/main/resources/mapper/ZtBugBindUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sa.zentao.mapper.ZtBugBoundUserMapper">
-    <resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtBugBoundUser">
+<mapper namespace="com.sa.zentao.mapper.ZtBugBindUserMapper">
+    <resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtBugBindUser">
             <result column="id" property="id" />
             <result column="bug_id" property="bugId" />
             <result column="assigned_to" property="assignedTo" />

src/main/resources/mapper/ZtBugMapper.xml

@@ -743,7 +743,7 @@
         and openedDate <![CDATA[<=]]>  #{end}
     </select>
 
-    <select id="bugBoundsListByProjectAndDate" resultType="com.sa.zentao.entity.ZtBug">
+    <select id="bugBindsListByProjectAndDate" resultType="com.sa.zentao.entity.ZtBug">
 
         SELECT s.id,
         s.project,
@@ -814,7 +814,7 @@
         s.ys_remark,
         s.release_flag
         from zt_bug s
-        LEFT JOIN zt_bug_bound_user u on  s.id = u.bug_id
+        LEFT JOIN zt_bug_bind_user u on  s.id = u.bug_id
 
         WHERE 1= 1  and u.assigned_to = #{account}
 
@@ -825,11 +825,124 @@
                 #{id}
             </foreach>
         </if>
+        <if test="bugType != null ">
+            and s.bug_type = #{bugType.value }
+        </if>
 
         and openedDate <![CDATA[>=]]>  #{start}
         and openedDate <![CDATA[<=]]>  #{end}
+
+
+        group by s.id
+    </select>
+
+    <select id="bugListByTestUser" resultType="com.sa.zentao.entity.ZtBug">
+
+        SELECT s.id,
+        s.project,
+        s.product,
+        s.injection,
+        s.identify,
+        s.branch,
+        s.module,
+        s.execution,
+        s.plan,
+        s.story,
+        s.storyVersion,
+        s.task,
+        s.toTask,
+        s.toStory,
+        s.title,
+        s.keywords,
+        s.severity,
+        s.pri,
+        s.type,
+        s.os,
+        s.browser,
+        s.hardware,
+        s.found,
+        s.`status`,
+        s.subStatus,
+        s.color,
+        s.confirmed,
+        s.activatedCount,
+        s.activatedDate,
+        s.feedbackBy,
+        s.notifyEmail,
+        s.mailto,
+        s.openedBy,
+        s.openedDate,
+        s.assignedTo,
+        s.openedBuild,
+        s.assignedDate,
+        s.deadline,
+        s.resolvedBy,
+        s.resolution,
+        s.resolvedBuild,
+        s.resolvedDate,
+        s.closedBy,
+        s.closedDate,
+        s.duplicateBug,
+        s.linkBug,
+        s.caseId,
+        s.caseVersion,
+        s.feedback,
+        s.result,
+        s.repo,
+        s.mr,
+        s.entry,
+        s.`lines`,
+        s.v1,
+        s.v2,
+        s.repoType,
+        s.testtask,
+        s.issueKey,
+        s.lastEditedBy,
+        s.lastEditedDate,
+        s.deleted,
+        s.file_url,
+        s.bug_type,
+        s.ys_user,
+        s.ys_flag,
+        s.ys_remark,
+        s.release_flag,
+        u.assigned_to  bindUser
+        from zt_bug s
+        LEFT JOIN zt_bug_bind_user u on  s.id = u.bug_id
+
+        WHERE 1= 1
+
+        <if test="pIds != null and pIds.size() > 0">
+            and s.product in
+            <foreach collection="pIds" item="id" index="index"
+                     open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="accounts != null and accounts.size() > 0">
+            and u.assigned_to in
+            <foreach collection="accounts" item="id" index="index"
+                     open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+
+        <if test="bugType != null ">
+            and s.bug_type = #{bugType.value }
+        </if>
+        <if test="start != null ">
+            and openedDate <![CDATA[>=]]>  #{start}
+        </if>
+        <if test="end != null ">
+            and openedDate <![CDATA[<=]]>  #{end}
+        </if>
+
+
+
         group by s.id
     </select>
 
 
+
 </mapper>

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})
         )