用户需求任务

src/main/resources/mapper/ZtBugMapper.xml

@@ -74,10 +74,67 @@
                 and project =#{qo.project}
             </if>
 
+            <if test="qo.id != null and  qo.id != 0">
+                and id =  #{qo.id}
+            </if>
+
+            <if test="qo.name != null and  qo.name != ''">
+                and title like concat('%', #{qo.name}, '%')
+            </if>
+            <if test="qo.severity != null and  qo.severity != ''">
+                and severity =  #{qo.severity}
+            </if>
+
+            <if test="qo.pri != null and  qo.pri != ''">
+                and pri =  #{qo.pri}
+            </if>
+
+            <if test="qo.type != null and  qo.type != ''">
+                and `type` =  #{qo.type}
+            </if>
+            <if test="qo.assignedTo != null and  qo.assignedTo != ''">
+                and assignedTo =  #{qo.assignedTo}
+            </if>
+            <if test="qo.startDate !=null">
+                and  openedDate   <![CDATA[>=]]>    #{qo.startDate}
+            </if>
+            <if test="qo.endDate !=null">
+                and  openedDate    <![CDATA[<=]]>  #{qo.endDate}
+            </if>
+            <if test="qo.openedby != null and  qo.openedby != ''">
+                and openedby =  #{qo.openedby}
+            </if>
+
+            <if test="qo.openStartDate !=null">
+                and  openedDate   <![CDATA[>=]]>    #{qo.openStartDate}
+            </if>
+            <if test="qo.openEndDate !=null">
+                and  openedDate    <![CDATA[<=]]>  #{qo.openEndDate}
+            </if>
             <if test="qo.execution != null and  qo.execution != '' ">
                 and execution =#{qo.execution}
             </if>
 
+
+            <if test="qo.productIds != null and qo.productIds.size() > 0">
+                and product in
+                <foreach collection="qo.productIds" item="id" index="index"
+                         open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+
+            </if>
+
+            <if test="qo.objIds != null and qo.objIds.size() > 0">
+                and id in
+                <foreach collection="qo.objIds" item="id" index="index"
+                         open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+
+            </if>
+
+
                 <if test="qo.searchVal == 'ALL' ">
 
                 </if>
@@ -139,7 +196,23 @@
                         --                     //研发需求变动
                 </if>
 
-            order by id desc
+
+            <choose>
+                <when test="qo.orderName != '' and qo.orderName != null  ">
+                    <choose>
+                        <when test="qo.orderSort != '' and qo.orderSort != null  ">
+                            order  by ${qo.orderName}  ${qo.orderSort}
+                        </when>
+                        <otherwise>
+                            order by id desc
+                        </otherwise>
+                    </choose>
+                </when>
+                <otherwise>
+                    order by id desc
+                </otherwise>
+            </choose>
+
 
         </select>
 
@@ -149,13 +222,47 @@
         SELECT s.*,pt.name productName from zt_bug s left join zt_product pt on  s.product = pt.id
         WHERE 1=1
 
+        <if test="qo.id != null and  qo.id != 0">
+            and s.id =  #{qo.id}
+        </if>
+
+        <if test="qo.name != null and  qo.name != ''">
+            and s.title like concat('%', #{qo.name}, '%')
+        </if>
+        <if test="qo.severity != null and  qo.severity != ''">
+            and s.severity =  #{qo.severity}
+        </if>
+
+        <if test="qo.pri != null and  qo.pri != ''">
+            and pri =  #{qo.pri}
+        </if>
+
+        <if test="qo.type != null and  qo.type != ''">
+            and s.`type` =  #{qo.type}
+        </if>
+        <if test="qo.assignedTo != null and  qo.assignedTo != ''">
+            and s.assignedTo =  #{qo.assignedTo}
+        </if>
+        <if test="qo.openedby != null and  qo.openedby != ''">
+            and s.openedby =  #{qo.openedby}
+        </if>
+
+        <if test="qo.openStartDate !=null">
+            and  s.openedDate   <![CDATA[>=]]>    #{qo.openStartDate}
+        </if>
+        <if test="qo.openEndDate !=null">
+            and  s.openedDate    <![CDATA[<=]]>  #{qo.openEndDate}
+        </if>
+
         <if test="qo.startDate !=null">
-            and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+            and  s.deadline   <![CDATA[>=]]>    #{qo.startDate}
         </if>
         <if test="qo.endDate !=null">
-            and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+            and  s.deadline    <![CDATA[<=]]>  #{qo.endDate}
         </if>
 
+
+
         <if test="qo.productName != null and qo.productName != '' ">
             and pt.name   like concat('%', #{qo.productName}, '%')
         </if>

src/main/resources/mapper/ZtStoryFeedbackMapper.xml

@@ -17,7 +17,21 @@
         SELECT * from zt_story_feedback  s WHERE 1 = 1
 
 
-
+        <if test="qo.type != null and qo.type != ''  ">
+            and s.`type` = #{qo.type}
+        </if>
+        <if test="qo.spec != null and  qo.spec != ''">
+            and  s.spec   like concat('%', #{qo.spec}, '%')
+        </if>
+        <if test="qo.status != null and  qo.status != ''">
+            and  s.status   = #{qo.status}
+        </if>
+        <if test="qo.openedby != null and  qo.openedby != ''">
+            and  s.opened_by   = #{qo.openedby}
+        </if>
+        <if test="qo.source != null and  qo.source != ''">
+            and  s.source   = #{qo.source}
+        </if>
 
         <if test="qo.productId != null and  qo.productId != ''">
             and  s.product = #{qo.productId}
@@ -34,7 +48,12 @@
             and s.opened_by= #{qo.userName}
         </if>
 
-
+        <if test="qo.startDate !=null">
+            and s.opened_date   <![CDATA[>=]]>    #{qo.startDate}
+        </if>
+        <if test="qo.endDate !=null">
+            and s.opened_date    <![CDATA[<=]]>  #{qo.endDate}
+        </if>
 
         <if test="qo.searchVal == 'YJJ' ">
             and s.status = 'finished'

src/main/resources/mapper/ZtStoryMapper.xml

@@ -123,23 +123,56 @@
                 and s.ys_flag =0)
                 or (s.stage = 'verified' and s.ys_flag =2)
             </if>
+        <if test="qo.name != null and qo.name != '' ">
+            and s.title like concat('%', #{qo.name}, '%')
+        </if>
+        <if test="qo.title != null and qo.title != '' ">
+            and s.title like concat('%', #{qo.title}, '%')
+        </if>
 
             <if test="qo.id != null ">
                     and s.id = #{qo.id}
             </if>
             <if test="qo.title != null and qo.title != '' ">
-                    and s.title = #{qo.title}
+                    and s.title like concat('%', #{qo.title}, '%')
             </if>
             <if test="qo.module != null and qo.module != '' ">
                     and s.module = #{qo.module}
             </if>
+        <if test="qo.assignedTo != null and qo.assignedTo != '' ">
+            and s.assignedTo = #{qo.assignedTo}
+        </if>
+        <if test="qo.pri != null and qo.pri != '' ">
+            and s.pri = #{qo.pri}
+        </if>
+        <if test="qo.status != null and qo.status != '' ">
+            and s.status = #{qo.status}
+        </if>
+
+
+        <if test="qo.stage != null and qo.stage != '' ">
+            and s.stage = #{qo.stage}
+        </if>
+        <if test="qo.openedby != null and qo.openedby != '' ">
+            and s.openedBy = #{qo.openedby}
+        </if>
+
+        <if test="qo.startDate !=null">
+            and s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+        </if>
+        <if test="qo.endDate !=null">
+            and s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+        </if>
 
         <if test="qo.searchVal != null and qo.searchVal == 'YWGB' ">
             and s.status ='closed'
             and closedBy =#{qo.userName}
         </if>
 
-
+        <if test="qo.searchVal != null and qo.searchVal == 'YWGB' ">
+            and s.status ='closed'
+            and closedBy =#{qo.userName}
+        </if>
 
 
 
@@ -185,14 +218,44 @@
             WHERE 1=1
 
 
+<!--        <if test="qo.startDate !=null">-->
+<!--            and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}-->
+<!--        </if>-->
+<!--        <if test="qo.endDate !=null">-->
+<!--            and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}-->
+<!--        </if>-->
+        <if test="qo.pri != null and qo.pri != '' ">
+            and s.pri = #{qo.pri}
+        </if>
+        <if test="qo.status != null and qo.status != '' ">
+            and s.status = #{qo.status}
+        </if>
+        <if test="qo.title != null and qo.title != '' ">
+            and s.title like concat('%', #{qo.title}, '%')
+        </if>
+
+        <if test="qo.stage != null and qo.stage != '' ">
+            and s.stage = #{qo.stage}
+        </if>
+        <if test="qo.openedby != null and qo.openedby != '' ">
+            and s.openedBy = #{qo.openedby}
+        </if>
+
         <if test="qo.startDate !=null">
-            and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+            and s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
         </if>
         <if test="qo.endDate !=null">
-            and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+            and s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+        </if>
+        <if test="qo.assignedTo != null and qo.assignedTo != '' ">
+            and s.assignedTo = #{qo.assignedTo}
+        </if>
+        <if test="qo.id != null ">
+            and s.id = #{qo.id}
+        </if>
+        <if test="qo.name != null and qo.name != '' ">
+            and s.title like concat('%', #{qo.name}, '%')
         </if>
-
-
 
         <if test="qo.productName != null and qo.productName != '' ">
             and pt.name   like concat('%', #{qo.productName}, '%')
@@ -206,8 +269,8 @@
                     and ps.project =#{qo.execution}
                 and ps.type= 'execution'
             </if>
-            <if test="qo.module != null ">
-                    and s.module =#{qo.module}
+            <if test="qo.moduleId != null ">
+                    and s.module =#{qo.moduleId}
             </if>
             <if test="qo.searchVal != null and qo.searchVal == 'ALL' ">
 
@@ -222,8 +285,10 @@
             <if test="qo.kfz == 1 ">
                 <if test="qo.userName != null and qo.userName != '' ">
 
-                    and s.assignedTo = #{qo.userName}
+                    and
+                     (s.assignedTo = #{qo.userName}
                     or s.openedBy =  #{qo.userName}
+                    )
                 </if>
 
             </if>
@@ -372,6 +437,41 @@
         left join zt_storyreview v on s.id  = v.story and s.version = v.version
         WHERE 1=1
 
+
+
+        <if test="qo.pri != null and qo.pri != '' ">
+            and s.pri = #{qo.pri}
+        </if>
+        <if test="qo.status != null and qo.status != '' ">
+            and s.status = #{qo.status}
+        </if>
+
+
+        <if test="qo.stage != null and qo.stage != '' ">
+            and s.stage = #{qo.stage}
+        </if>
+        <if test="qo.openedby != null and qo.openedby != '' ">
+            and s.openedBy = #{qo.openedby}
+        </if>
+
+        <if test="qo.startDate !=null">
+            and s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+        </if>
+        <if test="qo.endDate !=null">
+            and s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+        </if>
+        <if test="qo.name != null and qo.name != '' ">
+            and s.title like concat('%', #{qo.name}, '%')
+        </if>
+        <if test="qo.id != null ">
+            and s.id = #{qo.id}
+        </if>
+        <if test="qo.title != null and qo.title != '' ">
+            and s.title  like concat('%', #{qo.title}, '%')
+        </if>
+        <if test="qo.assignedTo != null and qo.assignedTo != '' ">
+            and s.assignedTo = #{qo.assignedTo}
+        </if>
         <if test="qo.project != null ">
             and ps.project =#{qo.project}
         </if>
@@ -473,6 +573,44 @@
         left join zt_storyreview v on s.id  = v.story and s.version = v.version
         WHERE 1=1
 
+
+
+
+        <if test="qo.pri != null and qo.pri != '' ">
+            and s.pri = #{qo.pri}
+        </if>
+        <if test="qo.status != null and qo.status != '' ">
+            and s.status = #{qo.status}
+        </if>
+
+
+        <if test="qo.stage != null and qo.stage != '' ">
+            and s.stage = #{qo.stage}
+        </if>
+        <if test="qo.openedby != null and qo.openedby != '' ">
+            and s.openedBy = #{qo.openedby}
+        </if>
+
+        <if test="qo.assignedTo != null and qo.assignedTo != '' ">
+            and s.assignedTo = #{qo.assignedTo}
+        </if>
+        <if test="qo.name != null and qo.name != '' ">
+            and s.title like concat('%', #{qo.name}, '%')
+        </if>
+        <if test="qo.startDate !=null">
+            and s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+        </if>
+        <if test="qo.endDate !=null">
+            and s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+        </if>
+
+        <if test="qo.id != null ">
+            and s.id = #{qo.id}
+        </if>
+        <if test="qo.title != null and qo.title != '' ">
+            and s.title  like concat('%', #{qo.title}, '%')
+        </if>
+
         <if test="qo.productIds != null and qo.productIds.size() > 0">
             and s.product in
             <foreach collection="qo.productIds" item="id" index="index"
@@ -518,8 +656,9 @@
         <if test="qo.searchVal != null and qo.searchVal == 'INDEX' ">
             <if test="qo.userName != null and qo.userName != '' ">
 
-                and s.assignedTo = #{qo.userName}
+                and  ( s.assignedTo = #{qo.userName}
                 or s.openedBy =  #{qo.userName}
+                )
             </if>
 
         </if>

src/main/resources/mapper/ZtStoryUserMapper.xml

@@ -87,8 +87,12 @@
             <if test="qo.endDate !=null">
                     and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
             </if>
-
-
+            <if test="qo.openedby != null and qo.openedby != '' ">
+                    and s.openedBy = #{qo.openedby}
+            </if>
+            <if test="qo.status != null and qo.status != '' ">
+                    and s.status = #{qo.status}
+            </if>
 
             <if test="qo.productName != null and qo.productName != '' ">
                     and pt.name   like concat('%', #{qo.productName}, '%')

src/main/resources/mapper/ZtStoryUserTaskMapper.xml

@@ -0,0 +1,89 @@
+<?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.ZtStoryUserTaskMapper">
+    <resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtStoryUserTask">
+            <result column="id" property="id" />
+            <result column="user_story_id" property="userStoryId" />
+            <result column="type" property="type" />
+            <result column="estimate" property="estimate" />
+            <result column="consumed" property="consumed" />
+            <result column="left" property="left" />
+            <result column="assigned_to" property="assignedTo" />
+            <result column="need_meeting" property="needMeeting" />
+            <result column="need_design" property="needDesign" />
+            <result column="product" property="product" />
+            <result column="name" property="name" />
+            <result column="remark" property="remark" />
+            <result column="estStarted" property="eststarted" />
+            <result column="deadline" property="deadline" />
+            <result column="realStarted" property="realstarted" />
+            <result column="finishedDate" property="finisheddate" />
+            <result column="finishedBy" property="finishedby" />
+            <result column="canceledBy" property="canceledby" />
+            <result column="canceledDate" property="canceleddate" />
+            <result column="closedBy" property="closedby" />
+            <result column="closedDate" property="closeddate" />
+            <result column="closed_remark" property="closedRemark" />
+            <result column="openedBy" property="openedby" />
+            <result column="openedDate" property="openeddate" />
+            <result column="pri" property="pri" />
+    </resultMap>
+    <select id="pageList" resultType="com.sa.zentao.dao.ZtStoryUserTaskDTO">
+        SELECT s.* from zt_story_user_task s,zt_product p WHERE s.product = p.id
+            <if test="qo.id != null and  qo.id != 0">
+                    and s.id =  #{qo.id}
+            </if>
+
+            <if test="qo.name != null and  qo.name != ''">
+                    and s.name like concat('%', #{qo.name}, '%')
+            </if>
+
+            <if test="qo.type != null and  qo.type != ''">
+                    and s.`type` =  #{qo.type}
+            </if>
+
+            <if test="qo.pri != null and  qo.pri != ''">
+                    and s.pri =  #{qo.pri}
+            </if>
+
+            <if test="qo.assignedTo != null and  qo.assignedTo != ''">
+                    and s.assigned_to =  #{qo.assignedTo}
+            </if>
+
+            <if test="qo.status != null and  qo.status != ''">
+                    and s.status =  #{qo.status}
+            </if>
+
+            <if test="qo.startDate !=null">
+                    and s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+            </if>
+            <if test="qo.endDate !=null">
+                    and s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+            </if>
+
+        <if test="qo.searchVal == 'ALL' ">
+
+        </if>
+        <if test="qo.searchVal == 'WGB' ">
+            and s.status != 'closed'
+        </if>
+
+        <if test="qo.searchVal == 'ZGW' ">
+            and s.assigned_to= #{qo.userName}
+        </if>
+
+
+        <if test="qo.searchVal == 'YGB' ">
+            and s.status = 'closed'
+        </if>
+        <if test="qo.productIds != null and qo.productIds.size() > 0">
+            and s.product in
+            <foreach collection="qo.productIds" item="id" index="index"
+                     open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+
+        </if>
+    </select>
+
+</mapper>

src/main/resources/mapper/ZtTaskMapper.xml

@@ -63,6 +63,31 @@
         left join zt_product pt on s.product = pt.id
         where 1= 1
 
+
+        <if test="qo.id != null and  qo.id != 0">
+            and s.id =  #{qo.id}
+        </if>
+
+        <if test="qo.name != null and  qo.name != ''">
+            and s.name like concat('%', #{qo.name}, '%')
+        </if>
+
+        <if test="qo.type != null and  qo.type != ''">
+            and s.`type` =  #{qo.type}
+        </if>
+
+        <if test="qo.pri != null and  qo.pri != ''">
+            and s.pri =  #{qo.pri}
+        </if>
+
+        <if test="qo.assignedTo != null and  qo.assignedTo != ''">
+            and s.assignedTo =  #{qo.assignedTo}
+        </if>
+
+        <if test="qo.status != null and  qo.status != ''">
+            and s.status =  #{qo.status}
+        </if>
+
         <if test="qo.startDate !=null">
             and s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
         </if>