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

新版绩效考核方案

Browse Source
This commit is contained in:
郭其兵
2025-05-07 11:19:15 +08:00
parent 607da4dfea
commit cba93c7d2b
64 changed files with 4005 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,63 +68,132 @@
</resultMap>
<select id="bugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
SELECT * from zt_bug
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 project =#{qo.project}
and b.project =#{qo.project}
</if>
<if test="qo.bugType != null and qo.bugType != ''">
and bug_type =#{qo.bugType}
and b.bug_type =#{qo.bugType}
</if>
<if test="qo.id != null and qo.id != 0">
and id = #{qo.id}
and b.id = #{qo.id}
</if>
<if test="qo.name != null and qo.name != ''">
and title like concat('%', #{qo.name}, '%')
and b.title like concat('%', #{qo.name}, '%')
</if>
<if test="qo.severity != null and qo.severity != ''">
and severity = #{qo.severity}
and b.severity = #{qo.severity}
</if>
<if test="qo.status != null and qo.status != ''">
and status = #{qo.status}
and b.status = #{qo.status}
</if>
<if test="qo.pri != null and qo.pri != ''">
and pri = #{qo.pri}
and b.pri = #{qo.pri}
</if>
<if test="qo.type != null and qo.type != ''">
and `type` = #{qo.type}
and b.`type` = #{qo.type}
</if>
<if test="qo.assignedTo != null and qo.assignedTo != ''">
and assignedTo = #{qo.assignedTo}
and b.assignedTo = #{qo.assignedTo}
</if>
<if test="qo.startDate !=null">
and openedDate <![CDATA[>=]]> #{qo.startDate}
and b.openedDate <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate !=null">
and openedDate <![CDATA[<=]]> #{qo.endDate}
and b.openedDate <![CDATA[<=]]> #{qo.endDate}
</if>
<if test="qo.openedby != null and qo.openedby != ''">
and openedby = #{qo.openedby}
and b.openedby = #{qo.openedby}
</if>
<if test="qo.openStartDate !=null">
and openedDate <![CDATA[>=]]> #{qo.openStartDate}
and b.openedDate <![CDATA[>=]]> #{qo.openStartDate}
</if>
<if test="qo.openEndDate !=null">
and openedDate <![CDATA[<=]]> #{qo.openEndDate}
and b.openedDate <![CDATA[<=]]> #{qo.openEndDate}
</if>
<if test="qo.execution != null and qo.execution != '' ">
and execution =#{qo.execution}
and b.execution =#{qo.execution}
</if>
<if test="qo.productIds != null and qo.productIds.size() > 0">
and product in
and b.product in
<foreach collection="qo.productIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
@ -133,7 +202,7 @@
</if>
<if test="qo.objIds != null and qo.objIds.size() > 0">
and id in
and b.id in
<foreach collection="qo.objIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
@ -147,38 +216,38 @@
</if>
<if test="qo.searchVal == 'WGB' ">
-- 未关闭
and status !='closed'
and b.status !='closed'
</if>
<if test="qo.searchVal == 'YWCJ' ">
-- 由我创建
and openedBy =#{qo.userName}
and b.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'ZPGW' ">
-- 指派给我
and assignedTo =#{qo.userName}
and b.assignedTo =#{qo.userName}
</if>
<if test="qo.searchVal == 'YWJJ' ">
-- 由我解决
and resolvedBy =#{qo.userName}
and status= 'resolved'
and b.resolvedBy =#{qo.userName}
and b.status= 'resolved'
</if>
<if test="qo.searchVal == 'YWZP' ">
-- 由我指派
and openedBy =#{qo.userName}
and b.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'WJJ' ">
-- //未解决
and status= 'active'
and b.status= 'active'
</if>
<if test="qo.searchVal == 'WQR' ">
-- //未确认
and confirmed= 0
and b.confirmed= 0
</if>
<if test="qo.searchVal == 'WZP' ">
-- //未指派
and assignedTo is null
and b.assignedTo is null
</if>
@ -226,7 +295,76 @@
<select id="myBugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
SELECT s.*,pt.name productName from zt_bug s left join zt_product pt on s.product = pt.id
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,
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">
@ -359,6 +497,170 @@
order by id desc
</select>
<select id="bugListByIds" 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="ids != null and ids.size() > 0">
and s.id in
<foreach collection="ids" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</select>
<select id="bugListByProductAndDate" 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.product in
<foreach collection="pIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
and openedDate <![CDATA[>=]]> #{start}
and openedDate <![CDATA[<=]]> #{end}
</select>
</mapper>

16
src/main/resources/mapper/ZtMeetingMapper.xml
View File

@ -17,7 +17,21 @@
<select id="pageList" resultType="com.sa.zentao.dao.ZtMeetingDTO">
SELECT m.* from zt_meeting m left join zt_product p on p.id = m.product_id
SELECT
m.id,
m.product_id,
m.`name`,
m.type,
m.meeting_date,
m.users,
m.create_user,
m.create_date,
m.update_user,
m.update_date,
m.address,
m.title,
m.story_ids
from zt_meeting m left join zt_product p on p.id = m.product_id
WHERE 1=1

15
src/main/resources/mapper/ZtMonthScopeMapper.xml Normal file
View File

@ -0,0 +1,15 @@
<?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.ZtMonthScoreMapper">
<resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtMonthScore">
<result column="id" property="id" />
<result column="account" property="account" />
<result column="date_str" property="dateStr" />
<result column="scope_json" property="scopeJson" />
<result column="create_date" property="createDate" />
<result column="create_user" property="createUser" />
<result column="update_date" property="updateDate" />
<result column="update_user" property="updateUser" />
</resultMap>
</mapper>

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

@ -2,38 +2,118 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sa.zentao.mapper.ZtReleaseDetailsMapper">
<resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtReleaseDetails">
<result column="id" property="id" />
<result column="release_id" property="releaseId" />
<result column="object_id" property="objectId" />
<result column="status" property="status" />
<result column="id" property="id"/>
<result column="release_id" property="releaseId"/>
<result column="object_id" property="objectId"/>
<result column="status" property="status"/>
</resultMap>
<select id="releaseStoryPageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
select s.*,sp.spec ,sp.verify,sp.files from (zt_story s,zt_projectstory ps,zt_release_details details ) left join zt_storyspec sp on s.id = sp.story
left join zt_storyreview v on s.id = v.story and s.version = v.version
left join zt_projectstory pstory on s.id = pstory.story and pstory.execution =0
left join zt_project pj on pstory.project = pj.id
select s.* from (zt_story s,zt_projectstory ps,zt_release_details details ) left
join zt_storyspec sp on s.id = sp.story
left join zt_storyreview v on s.id = v.story and s.version = v.version
left join zt_projectstory pstory on s.id = pstory.story and pstory.execution =0
left join zt_project pj on pstory.project = pj.id
WHERE s.id = ps.story
and s.id = details.object_id
and details.object_type ='story'
and details.release_id = #{qo.id}
and details.status != 'closed'
WHERE s.id = ps.story
and s.id = details.object_id
and details.object_type ='story'
and details.release_id = #{qo.id}
and details.status != 'closed'
<if test="qo.name != null and qo.name != '' ">
and s.title like concat('%', #{qo.name}, '%')
</if>
<if test="qo.ysStatus != null and qo.ysStatus != '' ">
and s.stage = #{qo.ysStatus}
</if>
<if test="qo.ysFlag != null ">
and s.ys_flag = #{qo.ysFlag}
</if>
<if test="qo.storyId != null ">
and s.id = #{qo.storyId}
</if>
group by s.id
group by s.id
</select>
<select id="releaseBugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
select b.* from (zt_bug b,zt_release_details details )
WHERE b.id = details.object_id
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
from (zt_bug b,zt_release_details details )
WHERE b.id = details.object_id
and details.object_type='bug'
and details.release_id = #{qo.id}
and details.status != 'closed'
@ -49,13 +129,13 @@
<select id="storyPageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
select s.*,sp.spec ,sp.verify,sp.files from zt_story s
left join zt_storyreview v on s.id = v.story and s.version = v.version
left join zt_storyspec sp on s.id = sp.story
where 1=1
and s.status='active'
and stage in ('wait','projected','developing','developed','testing','tested')
and s.id in
select s.* from zt_story s
left join zt_storyreview v on s.id = v.story and s.version = v.version
left join zt_storyspec sp on s.id = sp.story
where 1=1
and s.status='active'
and stage in ('wait','projected','developing','developed','testing','tested')
and s.id in
<foreach collection="qo.storyList" item="id" index="index"
open="(" close=")" separator=",">
#{id}
@ -72,11 +152,11 @@
group by s.id
</select>
<select id="releaseNotSyncBugPageList" resultType="com.sa.zentao.dao.ZtBugDTO">
SELECT b.* from zt_bug b WHERE 1= 1
and b.id not in
(select d.object_id from zt_release_details d,zt_release re
WHERE d.release_id = re.id and re.project = #{qo.project}
and d.object_type = 'bug' and d.`status` != 'closed')
SELECT b.* from zt_bug b WHERE 1= 1
and b.id not in
(select d.object_id from zt_release_details d,zt_release re
WHERE d.release_id = re.id and re.project = #{qo.project}
and d.object_type = 'bug' and d.`status` != 'closed')
and b.project = #{qo.project}
<if test="qo.name != null and qo.name != '' ">
and b.title like concat('%', #{qo.name}, '%')

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

@ -14,7 +14,37 @@
<result column="scouce" property="scouce" />
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtStoryFeedbackDTO">
SELECT * from zt_story_feedback s WHERE 1 = 1
SELECT
id,
`name`,
files,
opened_by,
opened_date,
update_date,
update_user,
story_id,
source,
plan_end_date,
assigned_to,
spec,
`status`,
finish_date,
file_url,
`type`,
close_remark,
product,
plan_finish_date,
hand_date,
close_date,
closed_by,
open_source,
weixin,
business_id,
ys_flag,
dont_hand_select,
dont_hand_remark
from zt_story_feedback s WHERE 1 = 1
<if test="qo.type != null and qo.type != '' ">

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

@ -64,9 +64,80 @@
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
select s.*,sp.spec ,sp.verify,sp.files from zt_story s
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_remark,
s.ys_user,
s.task_count,
s.ys_date
from zt_story s
left join zt_storyreview v on s.id = v.story and s.version = v.version
left join zt_storyspec sp on s.id = sp.story
where 1=1
and product = #{qo.productId}
@ -212,7 +283,79 @@
select s.*,sp.spec ,sp.verify,sp.files,pt.name productName from zt_story s left join zt_storyspec sp on s.id = sp.story
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_remark,
s.ys_user,
s.task_count,
s.ys_date,
pt.name productName
from zt_story s
left join zt_storyreview v on s.id = v.story and s.version = v.version
left join zt_projectstory pstory on s.id = pstory.story and pstory.execution =0
@ -441,7 +584,78 @@
<select id="allStoryPageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
select s.*,sp.spec ,sp.verify,sp.files from zt_story s left join zt_storyspec sp on s.id = sp.story
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_remark,
s.ys_user,
s.task_count,
s.ys_date,
from zt_story s
left join zt_storyreview v on s.id = v.story and s.version = v.version
WHERE 1=1
@ -576,7 +790,79 @@
</select>
<select id="myStoryPageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
select s.*,sp.spec ,sp.verify,sp.files ,pt.name productName from zt_story s left join zt_storyspec sp on s.id = sp.story
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
,pt.name productName
from zt_story s
left join zt_product pt on s.product = pt.id
left join zt_storyreview v on s.id = v.story and s.version = v.version
WHERE 1=1
@ -751,7 +1037,77 @@
</select>
<select id="storyPageListByIds" resultType="com.sa.zentao.dao.ZtStoryDTO">
select s.*,sp.spec ,sp.verify,sp.files from zt_story s left join zt_storyspec sp on s.id = sp.story
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
left join zt_storyreview v on s.id = v.story and s.version = v.version
WHERE 1=1
<if test="ids != null and ids.size() > 0">

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

@ -70,7 +70,78 @@
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtStoryUserDTO">
SELECT s.*,pt.name productName from zt_story_user s LEFT JOIN zt_product pt on s.product = pt.id WHERE 1=1
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.file_url,
s.ps_date,
s.deliver_remark,
s.old_status,
pt.name productName from zt_story_user s LEFT JOIN zt_product pt on s.product = pt.id WHERE 1=1
<if test="qo.productIds != null and qo.productIds.size() > 0">
and s.product in
@ -116,7 +187,7 @@
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.searchVal == 'YGB' ">

27
src/main/resources/mapper/ZtStoryUserTaskMapper.xml
View File

@ -29,7 +29,32 @@
<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
SELECT s.id,
s.user_story_id,
s.type,
s.consumed,
s.estimate,
s.`left`,
s.assigned_to,
s.need_meeting,
s.need_design,
s.product,
s.`name`,
s.estStarted,
s.deadline,
s.realStarted,
s.finishedDate,
s.finishedBy,
s.canceledBy,
s.canceledDate,
s.closedBy,
s.closed_date,
s.opened_by,
s.opened_date,
s.pri,
s.last_edited_by,
s.last_edited_date,
s.`status` 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>

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

@ -59,7 +59,70 @@
</resultMap>
<select id="taskPageList" resultType="com.sa.zentao.dao.ZtTaskDTO">
select s.*,pt.name productName from zt_task s left join zt_project project on s.project = project.id
select
s.reviewing_user,
s.deadline_time,
s.product,
s.finished_flag,
s.approval_result,
s.use_time,
s.apply_date,
s.approval_remark,
s.files,
s.vision,
s.deleted,
s.v2,
s.v1,
s.`lines`,
s.entry,
s.mr,
s.`order`,
s.repo,
s.activatedDate,
s.lastEditedDate,
s.lastEditedBy,
s.closedReason,
s.realDuration,
s.planDuration,
s.closedDate,
s.closedBy,
s.canceledDate,
s.canceledBy,
s.finishedList,
s.finishedDate,
s.finishedBy,
s.realStarted,
s.estStarted,
s.assignedDate,
s.assignedTo,
s.openedDate,
s.openedBy,
s.version,
s.mailto,
s.color,
s.subStatus,
s.`status`,
s.deadline,
s.`left`,
s.consumed,
s.estimate,
s.pri,
s.`mode`,
s.type,
s.`name`,
s.fromIssue,
s.feedback,
s.fromBug,
s.designVersion,
s.storyVersion,
s.story,
s.design,
s.module,
s.execution,
s.parent,
s.project,
s.id,
pt.name productName from zt_task s left join zt_project project on s.project = project.id
left join zt_product pt on s.product = pt.id
where 1= 1
@ -104,6 +167,14 @@
</if>
<if test="qo.productIds != null and qo.productIds.size() > 0">
and pt.id 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 s.id in
@ -264,6 +335,308 @@
</select>
<select id="taskListByIds" resultType="com.sa.zentao.entity.ZtTask">
select
s.reviewing_user,
s.deadline_time,
s.product,
s.finished_flag,
s.approval_result,
s.use_time,
s.apply_date,
s.approval_remark,
s.files,
s.vision,
s.deleted,
s.v2,
s.v1,
s.`lines`,
s.entry,
s.mr,
s.`order`,
s.repo,
s.activatedDate,
s.lastEditedDate,
s.lastEditedBy,
s.closedReason,
s.realDuration,
s.planDuration,
s.closedDate,
s.closedBy,
s.canceledDate,
s.canceledBy,
s.finishedList,
s.finishedDate,
s.finishedBy,
s.realStarted,
s.estStarted,
s.assignedDate,
s.assignedTo,
s.openedDate,
s.openedBy,
s.version,
s.mailto,
s.color,
s.subStatus,
s.`status`,
s.deadline,
s.`left`,
s.consumed,
s.estimate,
s.pri,
s.`mode`,
s.type,
s.`name`,
s.fromIssue,
s.feedback,
s.fromBug,
s.designVersion,
s.storyVersion,
s.story,
s.design,
s.module,
s.execution,
s.parent,
s.project,
s.id
from zt_task s
where 1= 1
<if test="ids != null and ids.size() > 0">
and s.id in
<foreach collection="ids" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</select>
<select id="taskListByStoryIds" resultType="com.sa.zentao.entity.ZtTask">
select
s.reviewing_user,
s.deadline_time,
s.product,
s.finished_flag,
s.approval_result,
s.use_time,
s.apply_date,
s.approval_remark,
s.files,
s.vision,
s.deleted,
s.v2,
s.v1,
s.`lines`,
s.entry,
s.mr,
s.`order`,
s.repo,
s.activatedDate,
s.lastEditedDate,
s.lastEditedBy,
s.closedReason,
s.realDuration,
s.planDuration,
s.closedDate,
s.closedBy,
s.canceledDate,
s.canceledBy,
s.finishedList,
s.finishedDate,
s.finishedBy,
s.realStarted,
s.estStarted,
s.assignedDate,
s.assignedTo,
s.openedDate,
s.openedBy,
s.version,
s.mailto,
s.color,
s.subStatus,
s.`status`,
s.deadline,
s.`left`,
s.consumed,
s.estimate,
s.pri,
s.`mode`,
s.type,
s.`name`,
s.fromIssue,
s.feedback,
s.fromBug,
s.designVersion,
s.storyVersion,
s.story,
s.design,
s.module,
s.execution,
s.parent,
s.project,
s.id
from zt_task s
where 1= 1
and s.story in
<foreach collection="ids" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
</select>
<select id="multipleDepartProjectTeam" resultType="com.sa.zentao.entity.ZtTask">
SELECT s.reviewing_user,
s.deadline_time,
s.product,
s.finished_flag,
s.approval_result,
s.use_time,
s.apply_date,
s.approval_remark,
s.files,
s.vision,
s.deleted,
s.v2,
s.v1,
s.`lines`,
s.entry,
s.mr,
s.`order`,
s.repo,
s.activatedDate,
s.lastEditedDate,
s.lastEditedBy,
s.closedReason,
s.realDuration,
s.planDuration,
s.closedDate,
s.closedBy,
s.canceledDate,
s.canceledBy,
s.finishedList,
s.finishedDate,
s.finishedBy,
s.realStarted,
s.estStarted,
s.assignedDate,
s.assignedTo,
s.openedDate,
s.openedBy,
s.version,
s.mailto,
s.color,
s.subStatus,
s.`status`,
s.deadline,
s.`left`,
s.consumed,
s.estimate,
s.pri,
s.`mode`,
s.type,
s.`name`,
s.fromIssue,
s.feedback,
s.fromBug,
s.designVersion,
s.storyVersion,
s.story,
s.design,
s.module,
s.execution,
s.parent,
s.project,
s.id
from (
SELECT p.program,t.* from zt_task t,zt_product p WHERE t.product = p.id
and ((t.openedDate >= #{start} and t.openedDate <![CDATA[<=]]> #{end}) or (t.finishedDate <![CDATA[>=]]> #{start} and t.finishedDate <![CDATA[<=]]> #{end} ) )
and t.`status` = 'done'
GROUP BY p.program ,t.assignedTo
ORDER BY assignedTo desc
) s GROUP BY s.assignedTo
HAVING count(1) >1
</select>
<select id="taskListByPIdsAndDate" resultType="com.sa.zentao.entity.ZtTask">
SELECT s.reviewing_user,
s.deadline_time,
s.product,
s.finished_flag,
s.approval_result,
s.use_time,
s.apply_date,
s.approval_remark,
s.files,
s.vision,
s.deleted,
s.v2,
s.v1,
s.`lines`,
s.entry,
s.mr,
s.`order`,
s.repo,
s.activatedDate,
s.lastEditedDate,
s.lastEditedBy,
s.closedReason,
s.realDuration,
s.planDuration,
s.closedDate,
s.closedBy,
s.canceledDate,
s.canceledBy,
s.finishedList,
s.finishedDate,
s.finishedBy,
s.realStarted,
s.estStarted,
s.assignedDate,
s.assignedTo,
s.openedDate,
s.openedBy,
s.version,
s.mailto,
s.color,
s.subStatus,
s.`status`,
s.deadline,
s.`left`,
s.consumed,
s.estimate,
s.pri,
s.`mode`,
s.type,
s.`name`,
s.fromIssue,
s.feedback,
s.fromBug,
s.designVersion,
s.storyVersion,
s.story,
s.design,
s.module,
s.execution,
s.parent,
s.project,
s.id
from zt_task s where 1=1
and s.product in
<foreach collection="pids" item="id" index="index"
open="(" close=")" separator=",">
#{id}
</foreach>
and (
(openedDate >= #{start} and s.openedDate <![CDATA[<=]]> #{end})
or
( finishedDate >= #{start} and s.finishedDate <![CDATA[<=]]> #{end})
)
</select>
</mapper>