OA/zentao
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

搜索条件添加

Browse Source
This commit is contained in:
郭其兵
2025-05-13 14:09:46 +08:00
parent 4d0bb07b0b
commit 81cf5bd74e
51 changed files with 1196 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

747
src/main/resources/mapper/ZtBugMapper.xml
View File

@ -2,295 +2,295 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sa.zentao.mapper.ZtBugMapper">
<resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtBug">
<result column="id" property="id" />
<result column="project" property="project" />
<result column="product" property="product" />
<result column="injection" property="injection" />
<result column="identify" property="identify" />
<result column="branch" property="branch" />
<result column="module" property="module" />
<result column="execution" property="execution" />
<result column="plan" property="plan" />
<result column="story" property="story" />
<result column="storyVersion" property="storyversion" />
<result column="task" property="task" />
<result column="toTask" property="totask" />
<result column="toStory" property="tostory" />
<result column="title" property="title" />
<result column="keywords" property="keywords" />
<result column="severity" property="severity" />
<result column="pri" property="pri" />
<result column="type" property="type" />
<result column="os" property="os" />
<result column="browser" property="browser" />
<result column="hardware" property="hardware" />
<result column="found" property="found" />
<result column="steps" property="steps" />
<result column="status" property="status" />
<result column="subStatus" property="substatus" />
<result column="color" property="color" />
<result column="confirmed" property="confirmed" />
<result column="activatedCount" property="activatedcount" />
<result column="activatedDate" property="activateddate" />
<result column="feedbackBy" property="feedbackby" />
<result column="notifyEmail" property="notifyemail" />
<result column="mailto" property="mailto" />
<result column="openedBy" property="openedby" />
<result column="openedDate" property="openeddate" />
<result column="openedBuild" property="openedbuild" />
<result column="assignedTo" property="assignedto" />
<result column="assignedDate" property="assigneddate" />
<result column="deadline" property="deadline" />
<result column="resolvedBy" property="resolvedby" />
<result column="resolution" property="resolution" />
<result column="resolvedBuild" property="resolvedbuild" />
<result column="resolvedDate" property="resolveddate" />
<result column="closedBy" property="closedby" />
<result column="closedDate" property="closeddate" />
<result column="duplicateBug" property="duplicatebug" />
<result column="linkBug" property="linkbug" />
<result column="case" property="caseId" />
<result column="caseVersion" property="caseversion" />
<result column="feedback" property="feedback" />
<result column="result" property="result" />
<result column="repo" property="repo" />
<result column="mr" property="mr" />
<result column="entry" property="entry" />
<result column="lines" property="lines" />
<result column="v1" property="v1" />
<result column="v2" property="v2" />
<result column="repoType" property="repotype" />
<result column="issueKey" property="issuekey" />
<result column="testtask" property="testtask" />
<result column="lastEditedBy" property="lasteditedby" />
<result column="lastEditedDate" property="lastediteddate" />
<result column="deleted" property="deleted" />
<result column="id" property="id"/>
<result column="project" property="project"/>
<result column="product" property="product"/>
<result column="injection" property="injection"/>
<result column="identify" property="identify"/>
<result column="branch" property="branch"/>
<result column="module" property="module"/>
<result column="execution" property="execution"/>
<result column="plan" property="plan"/>
<result column="story" property="story"/>
<result column="storyVersion" property="storyversion"/>
<result column="task" property="task"/>
<result column="toTask" property="totask"/>
<result column="toStory" property="tostory"/>
<result column="title" property="title"/>
<result column="keywords" property="keywords"/>
<result column="severity" property="severity"/>
<result column="pri" property="pri"/>
<result column="type" property="type"/>
<result column="os" property="os"/>
<result column="browser" property="browser"/>
<result column="hardware" property="hardware"/>
<result column="found" property="found"/>
<result column="steps" property="steps"/>
<result column="status" property="status"/>
<result column="subStatus" property="substatus"/>
<result column="color" property="color"/>
<result column="confirmed" property="confirmed"/>
<result column="activatedCount" property="activatedcount"/>
<result column="activatedDate" property="activateddate"/>
<result column="feedbackBy" property="feedbackby"/>
<result column="notifyEmail" property="notifyemail"/>
<result column="mailto" property="mailto"/>
<result column="openedBy" property="openedby"/>
<result column="openedDate" property="openeddate"/>
<result column="openedBuild" property="openedbuild"/>
<result column="assignedTo" property="assignedto"/>
<result column="assignedDate" property="assigneddate"/>
<result column="deadline" property="deadline"/>
<result column="resolvedBy" property="resolvedby"/>
<result column="resolution" property="resolution"/>
<result column="resolvedBuild" property="resolvedbuild"/>
<result column="resolvedDate" property="resolveddate"/>
<result column="closedBy" property="closedby"/>
<result column="closedDate" property="closeddate"/>
<result column="duplicateBug" property="duplicatebug"/>
<result column="linkBug" property="linkbug"/>
<result column="case" property="caseId"/>
<result column="caseVersion" property="caseversion"/>
<result column="feedback" property="feedback"/>
<result column="result" property="result"/>
<result column="repo" property="repo"/>
<result column="mr" property="mr"/>
<result column="entry" property="entry"/>
<result column="lines" property="lines"/>
<result column="v1" property="v1"/>
<result column="v2" property="v2"/>
<result column="repoType" property="repotype"/>
<result column="issueKey" property="issuekey"/>
<result column="testtask" property="testtask"/>
<result column="lastEditedBy" property="lasteditedby"/>
<result column="lastEditedDate" property="lastediteddate"/>
<result column="deleted" property="deleted"/>
</resultMap>
<select id="bugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
<select id="bugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
SELECT b.id,
b.project,
b.product,
b.injection,
b.identify,
b.branch,
b.module,
b.execution,
b.plan,
b.story,
b.storyVersion,
b.task,
b.toTask,
b.toStory,
b.title,
b.keywords,
b.severity,
b.pri,
b.type,
b.os,
b.browser,
b.hardware,
b.found,
b.`status`,
b.subStatus,
b.color,
b.confirmed,
b.activatedCount,
b.activatedDate,
b.feedbackBy,
b.notifyEmail,
b.mailto,
b.openedBy,
b.openedDate,
b.assignedTo,
b.openedBuild,
b.assignedDate,
b.deadline,
b.resolvedBy,
b.resolution,
b.resolvedBuild,
b.resolvedDate,
b.closedBy,
b.closedDate,
b.duplicateBug,
b.linkBug,
b.caseId,
b.caseVersion,
b.feedback,
b.result,
b.repo,
b.mr,
b.entry,
b.`lines`,
b.v1,
b.v2,
b.repoType,
b.testtask,
b.issueKey,
b.lastEditedBy,
b.lastEditedDate,
b.deleted,
b.file_url,
b.bug_type,
b.ys_user,
b.ys_flag,
b.ys_remark,
b.release_flag,
p.name productName
from zt_bug b left join zt_product p on b.product = p.id
WHERE 1=1
<if test="qo.project != null and qo.project != 0">
and b.project =#{qo.project}
</if>
<if test="qo.bugType != null and qo.bugType != ''">
and b.bug_type =#{qo.bugType}
</if>
SELECT b.id,
b.project,
b.product,
b.injection,
b.identify,
b.branch,
b.module,
b.execution,
b.plan,
b.story,
b.storyVersion,
b.task,
b.toTask,
b.toStory,
b.title,
b.keywords,
b.severity,
b.pri,
b.type,
b.os,
b.browser,
b.hardware,
b.found,
b.`status`,
b.subStatus,
b.color,
b.confirmed,
b.activatedCount,
b.activatedDate,
b.feedbackBy,
b.notifyEmail,
b.mailto,
b.openedBy,
b.openedDate,
b.assignedTo,
b.openedBuild,
b.assignedDate,
b.deadline,
b.resolvedBy,
b.resolution,
b.resolvedBuild,
b.resolvedDate,
b.closedBy,
b.closedDate,
b.duplicateBug,
b.linkBug,
b.caseId,
b.caseVersion,
b.feedback,
b.result,
b.repo,
b.mr,
b.entry,
b.`lines`,
b.v1,
b.v2,
b.repoType,
b.testtask,
b.issueKey,
b.lastEditedBy,
b.lastEditedDate,
b.deleted,
b.file_url,
b.bug_type,
b.ys_user,
b.ys_flag,
b.ys_remark,
b.release_flag,
p.name productName
from zt_bug b left join zt_product p on b.product = p.id
WHERE 1=1
<if test="qo.project != null and qo.project != 0">
and b.project =#{qo.project}
</if>
<if test="qo.bugType != null and qo.bugType != ''">
and b.bug_type =#{qo.bugType}
</if>
<if test="qo.id != null and qo.id != 0">
and b.id = #{qo.id}
</if>
<if test="qo.id != null and qo.id != 0">
and b.id = #{qo.id}
</if>
<if test="qo.name != null and qo.name != ''">
and b.title like concat('%', #{qo.name}, '%')
</if>
<if test="qo.severity != null and qo.severity != ''">
and b.severity = #{qo.severity}
</if>
<if test="qo.name != null and qo.name != ''">
and b.title like concat('%', #{qo.name}, '%')
</if>
<if test="qo.severity != null and qo.severity != ''">
and b.severity = #{qo.severity}
</if>
<if test="qo.status != null and qo.status != ''">
and b.status = #{qo.status}
</if>
<if test="qo.status != null and qo.status != ''">
and b.status = #{qo.status}
</if>
<if test="qo.pri != null and qo.pri != ''">
and b.pri = #{qo.pri}
</if>
<if test="qo.pri != null and qo.pri != ''">
and b.pri = #{qo.pri}
</if>
<if test="qo.type != null and qo.type != ''">
and b.`type` = #{qo.type}
</if>
<if test="qo.assignedTo != null and qo.assignedTo != ''">
and b.assignedTo = #{qo.assignedTo}
</if>
<if test="qo.startDate !=null">
and b.openedDate <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and b.openedDate <![CDATA[<=]]> #{qo.endDate}
</if>
<if test="qo.openedby != null and qo.openedby != ''">
and b.openedby = #{qo.openedby}
</if>
<if test="qo.type != null and qo.type != ''">
and b.`type` = #{qo.type}
</if>
<if test="qo.assignedTo != null and qo.assignedTo != ''">
and b.assignedTo = #{qo.assignedTo}
</if>
<if test="qo.startDate !=null">
and b.openedDate <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and b.openedDate <![CDATA[<=]]> #{qo.endDate}
</if>
<if test="qo.openedby != null and qo.openedby != ''">
and b.openedby = #{qo.openedby}
</if>
<if test="qo.openStartDate !=null">
and b.openedDate <![CDATA[>=]]> #{qo.openStartDate}
</if>
<if test="qo.openEndDate !=null">
and b.openedDate <![CDATA[<=]]> #{qo.openEndDate}
</if>
<if test="qo.execution != null and qo.execution != '' ">
and b.execution =#{qo.execution}
</if>
<if test="qo.openStartDate !=null">
and b.openedDate <![CDATA[>=]]> #{qo.openStartDate}
</if>
<if test="qo.openEndDate !=null">
and b.openedDate <![CDATA[<=]]> #{qo.openEndDate}
</if>
<if test="qo.execution != null and qo.execution != '' ">
and b.execution =#{qo.execution}
</if>
<if test="qo.productIds != null and qo.productIds.size() > 0">
and b.product in
<foreach collection="qo.productIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
<if test="qo.productIds != null and qo.productIds.size() > 0">
and b.product in
<foreach collection="qo.productIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</if>
<if test="qo.objIds != null and qo.objIds.size() > 0">
and b.id in
<foreach collection="qo.objIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
<if test="qo.objIds != null and qo.objIds.size() > 0">
and b.id in
<foreach collection="qo.objIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</if>
<if test="qo.searchVal == 'ALL' ">
<if test="qo.searchVal == 'ALL' ">
</if>
<if test="qo.searchVal == 'WGB' ">
-- 未关闭
and b.status !='closed'
</if>
<if test="qo.searchVal == 'YWCJ' ">
-- 由我创建
and b.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'ZPGW' ">
-- 指派给我
and b.assignedTo =#{qo.userName}
</if>
<if test="qo.searchVal == 'YWJJ' ">
-- 由我解决
and b.resolvedBy =#{qo.userName}
and b.status= 'resolved'
</if>
<if test="qo.searchVal == 'YWZP' ">
-- 由我指派
and b.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'WJJ' ">
-- //未解决
and b.status= 'active'
</if>
</if>
<if test="qo.searchVal == 'WGB' ">
-- 未关闭
and b.status !='closed'
</if>
<if test="qo.searchVal == 'YWCJ' ">
-- 由我创建
and b.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'ZPGW' ">
-- 指派给我
and b.assignedTo =#{qo.userName}
</if>
<if test="qo.searchVal == 'YWJJ' ">
-- 由我解决
and b.resolvedBy =#{qo.userName}
and b.status= 'resolved'
</if>
<if test="qo.searchVal == 'YWZP' ">
-- 由我指派
and b.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'WJJ' ">
-- //未解决
and b.status= 'active'
</if>
<if test="qo.searchVal == 'WQR' ">
-- //未确认
and b.confirmed= 0
</if>
<if test="qo.searchVal == 'WQR' ">
-- //未确认
and b.confirmed= 0
</if>
<if test="qo.searchVal == 'WZP' ">
-- //未指派
and b.assignedTo is null
</if>
<if test="qo.searchVal == 'WZP' ">
-- //未指派
and b.assignedTo is null
</if>
<if test="qo.searchVal == 'JWCL' ">
-- //久未处理
<if test="qo.searchVal == 'JWCL' ">
-- //久未处理
</if>
</if>
<if test="qo.searchVal == 'DGB' ">
-- //待关闭
<if test="qo.searchVal == 'DGB' ">
-- //待关闭
</if>
<if test="qo.searchVal == 'BYQ' ">
-- //被延期
</if>
</if>
<if test="qo.searchVal == 'BYQ' ">
-- //被延期
</if>
<if test="qo.searchVal == 'GQ' ">
-- //过期BUG
</if>
<if test="qo.searchVal == 'GQ' ">
-- //过期BUG
</if>
<if test="qo.searchVal == 'XQBD' ">
-- //研发需求变动
</if>
<if test="qo.searchVal == 'XQBD' ">
-- //研发需求变动
</if>
<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>
<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>
</select>
<select id="myBugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
@ -364,52 +364,51 @@
s.ys_remark,
s.release_flag,
pt.name productName from zt_bug s left join zt_product pt on s.product = pt.id
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}
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}
and s.severity = #{qo.severity}
</if>
<if test="qo.pri != null and qo.pri != ''">
and pri = #{qo.pri}
and pri = #{qo.pri}
</if>
<if test="qo.type != null and qo.type != ''">
and s.`type` = #{qo.type}
and s.`type` = #{qo.type}
</if>
<if test="qo.assignedTo != null and qo.assignedTo != ''">
and s.assignedTo = #{qo.assignedTo}
and s.assignedTo = #{qo.assignedTo}
</if>
<if test="qo.openedby != null and qo.openedby != ''">
and s.openedby = #{qo.openedby}
and s.openedby = #{qo.openedby}
</if>
<if test="qo.openStartDate !=null">
and s.openedDate <![CDATA[>=]]> #{qo.openStartDate}
and s.openedDate <![CDATA[>=]]> #{qo.openStartDate}
</if>
<if test="qo.openEndDate !=null">
and s.openedDate <![CDATA[<=]]> #{qo.openEndDate}
and s.openedDate <![CDATA[<=]]> #{qo.openEndDate}
</if>
<if test="qo.startDate !=null">
and s.deadline <![CDATA[>=]]> #{qo.startDate}
and s.deadline <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and s.deadline <![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}, '%')
and pt.name like concat('%', #{qo.productName}, '%')
</if>
@ -435,70 +434,69 @@
</if>
<if test="qo.searchVal == 'WGB' ">
-- 未关闭
-- 未关闭
and s.status !='closed'
</if>
<if test="qo.searchVal == 'YWCJ' ">
-- 由我创建
-- 由我创建
and s.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'ZPGW' ">
-- 指派给我
-- 指派给我
and s.assignedTo =#{qo.userName}
</if>
<if test="qo.searchVal == 'YWJJ' ">
-- 由我解决
-- 由我解决
and resolvedBy =#{qo.userName}
and s.status= 'resolved'
</if>
<if test="qo.searchVal == 'YWZP' ">
-- 由我指派
-- 由我指派
and s.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'WJJ' ">
-- //未解决
-- //未解决
and s.status= 'active'
</if>
<if test="qo.searchVal == 'WQR' ">
-- //未确认
-- //未确认
and s.confirmed= 0
</if>
<if test="qo.searchVal == 'WZP' ">
-- //未指派
-- //未指派
and s.assignedTo is null
</if>
<if test="qo.searchVal == 'JWCL' ">
-- //久未处理
-- //久未处理
</if>
<if test="qo.searchVal == 'DGB' ">
-- //待关闭
-- //待关闭
</if>
<if test="qo.searchVal == 'BYQ' ">
-- //被延期
-- //被延期
</if>
<if test="qo.searchVal == 'GQ' ">
-- //过期BUG
-- //过期BUG
</if>
<if test="qo.searchVal == 'XQBD' ">
-- //研发需求变动
-- //研发需求变动
</if>
order by id desc
</select>
<select id="bugListByIds" resultType="com.sa.zentao.entity.ZtBug">
SELECT s.id,
SELECT s.id,
s.project,
s.product,
s.injection,
@ -567,7 +565,7 @@
s.ys_remark,
s.release_flag
from zt_bug s
WHERE 1=1
WHERE 1=1
<if test="ids != null and ids.size() > 0">
and s.id in
<foreach collection="ids" item="id" index="index"
@ -661,6 +659,177 @@
</select>
<select id="bugListByProjectAndDate" 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
from zt_bug s
WHERE 1=1
<if test="pIds != null and pIds.size() > 0">
and s.project in
<foreach collection="pIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
and openedDate <![CDATA[>=]]> #{start}
and openedDate <![CDATA[<=]]> #{end}
</select>
<select id="bugBoundsListByProjectAndDate" 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
from zt_bug s
LEFT JOIN zt_bug_bound_user u on s.id = u.bug_id
WHERE 1= 1 and u.assigned_to = #{account}
<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>
and openedDate <![CDATA[>=]]> #{start}
and openedDate <![CDATA[<=]]> #{end}
group by s.id
</select>
</mapper>

5
src/main/resources/mapper/ZtReleaseDetailsMapper.xml
View File

@ -22,6 +22,11 @@
and details.release_id = #{qo.id}
and details.status != 'closed'
<if test="qo.ysUser != null and qo.ysUser != '' ">
and s.ys_user = #{qo.ysUser}
</if>
<if test="qo.name != null and qo.name != '' ">
and s.title like concat('%', #{qo.name}, '%')
</if>

4
src/main/resources/mapper/ZtStoryFeedbackMapper.xml
View File

@ -42,8 +42,8 @@
business_id,
ys_flag,
dont_hand_select,
dont_hand_remark
dont_hand_remark,
finished_remark
from zt_story_feedback s WHERE 1 = 1

90
src/main/resources/mapper/ZtStoryMapper.xml
View File

@ -1105,7 +1105,7 @@
s.user_story,
s.ys_user,
s.task_count,
s.ys_date,
s.ys_date
from zt_story s
left join zt_storyreview v on s.id = v.story and s.version = v.version
@ -1121,4 +1121,92 @@
order by s.id desc
</select>
<select id="getStoryListByDatePidsProject" resultType="com.sa.zentao.entity.ZtStory">
select s.id,
s.vision,
s.parent,
s.product,
s.project,
s.branch,
s.module,
s.plan,
s.source,
s.sourceNote,
s.fromBug,
s.feedback,
s.title,
s.keywords,
s.type,
s.category,
s.pri,
s.estimate,
s.`status`,
s.subStatus,
s.color,
s.stage,
s.stagedBy,
s.mailto,
s.lib,
s.fromStory,
s.fromVersion,
s.openedBy,
s.openedDate,
s.assignedTo,
s.assignedDate,
s.approvedDate,
s.lastEditedBy,
s.lastEditedDate,
s.changedBy,
s.changedDate,
s.reviewedBy,
s.reviewedDate,
s.releasedDate,
s.closedBy,
s.closedDate,
s.closedReason,
s.activatedDate,
s.toBug,
s.childStories,
s.linkStories,
s.linkRequirements,
s.twins,
s.duplicateStory,
s.version,
s.storyChanged,
s.feedbackBy,
s.notifyEmail,
s.BSA,
s.duration,
s.demand,
s.submitedBy,
s.roadmap,
s.URChanged,
s.deleted,
s.plan_start_date,
s.plan_end_date,
s.start_date,
s.end_date,
s.ys_flag,
s.user_story,
s.ys_user,
s.task_count,
s.ys_date
from zt_story s, zt_projectstory ps WHERE s.id = ps.story
<if test="ids != null and ids.size() > 0">
and s.product in
<foreach collection="ids" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
and ps.project = #{project}
<if test="start !=null">
and s.end_date <![CDATA[>=]]> #{start}
</if>
<if test="end !=null">
and s.end_date <![CDATA[<=]]> #{end}
</if>
</select>
</mapper>

12
src/main/resources/mapper/ZtStoryUserMapper.xml
View File

@ -161,8 +161,18 @@
<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 test="qo.status != null and qo.status == 'unconfirmed' ">
and s.status in ('unconfirmed'
,'waitcommunicate'
,'waitdesign','designdoing','designdone','storyunconfirmed')
</if>
<if test="qo.status != null and qo.status != 'unconfirmed' ">
and s.status = #{qo.status}
</if>
</if>
<if test="qo.productName != null and qo.productName != '' ">

12
src/main/resources/mapper/ZtTaskMapper.xml
View File

@ -127,6 +127,18 @@
where 1= 1
<if test="qo.delayFlag != null and qo.delayFlag != 0">
<if test="qo.delayFlag==1">
and (date(deadline ) <![CDATA[<]]> date(finishedDate ) or( finishedDate is null and date(deadline) <![CDATA[<]]> date(now())))
</if>
<if test="qo.delayFlag==2">
and (date(deadline ) <![CDATA[>=]]> date(finishedDate ) or( finishedDate is null and date(deadline) <![CDATA[>=]]> date(now())))
</if>
</if>
<if test="qo.id != null and qo.id != 0">
and s.id = #{qo.id}
</if>

10
src/main/resources/mapper/ZtYwBackupsMapper.xml
View File

@ -15,6 +15,16 @@
<select id="pageList" resultType="com.sa.zentao.dao.ZtYwBackupsDTO">
SELECT * from zt_yw_backups WHERE 1=1
<if test="qo.startDate !=null">
and backups_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and backups_date <![CDATA[<=]]> #{qo.endDate}
</if>
order by id desc
</select>

9
src/main/resources/mapper/ZtYwChangeMapper.xml
View File

@ -24,6 +24,15 @@
SELECT * from zt_yw_change WHERE 1=1
<if test="qo.startDate !=null">
and change_effect_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and change_effect_date <![CDATA[<=]]> #{qo.endDate}
</if>
order by id desc
</select>

9
src/main/resources/mapper/ZtYwFwqsearchMapper.xml
View File

@ -17,6 +17,15 @@
<select id="pageList" resultType="com.sa.zentao.dao.ZtYwFwqsearchDTO">
SELECT * from zt_yw_fwqsearch WHERE 1=1
<if test="qo.startDate !=null">
and create_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and create_date <![CDATA[<=]]> #{qo.endDate}
</if>
order by id desc
</select>

8
src/main/resources/mapper/ZtYwMachineRoomMapper.xml
View File

@ -19,6 +19,14 @@
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtYwMachineRoomDTO">
SELECT * from zt_yw_machine_room WHERE 1= 1
<if test="qo.startDate !=null">
and inspect_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and inspect_date <![CDATA[<=]]> #{qo.endDate}
</if>
order by id desc
</select>

7
src/main/resources/mapper/ZtYwPatrolMapper.xml
View File

@ -19,6 +19,13 @@
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtYwPatrolDTO">
SELECT * from zt_yw_patrol WHERE 1=1
<if test="qo.startDate !=null">
and patrol_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and patrol_date <![CDATA[<=]]> #{qo.endDate}
</if>
</select>
</mapper>

9
src/main/resources/mapper/ZtYwTaskMapper.xml
View File

@ -18,6 +18,15 @@
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtYwTaskDTO">
SELECT * from zt_yw_task WHERE 1=1
<if test="qo.startDate !=null">
and task_end_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and task_end_date <![CDATA[<=]]> #{qo.endDate}
</if>
order by id desc
</select>