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

bug优化

Browse Source
This commit is contained in:
郭其兵
2025-02-18 09:13:28 +08:00
parent cbbc785b74
commit 462460ee72
27 changed files with 691 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@
<if test="qo.objIds != null and qo.objIds.size() > 0">
and id in
and s.id in
<foreach collection="qo.objIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
@ -165,7 +165,7 @@
<if test="qo.projectIds != null and qo.projectIds.size() > 0">
and project in
and s.project in
<foreach collection="qo.projectIds" item="id" index="index"
open="(" close=")" separator=",">
#{id}
@ -177,38 +177,38 @@
</if>
<if test="qo.searchVal == 'WGB' ">
-- 未关闭
and status !='closed'
and s.status !='closed'
</if>
<if test="qo.searchVal == 'YWCJ' ">
-- 由我创建
and openedBy =#{qo.userName}
and s.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'ZPGW' ">
-- 指派给我
and assignedTo =#{qo.userName}
and s.assignedTo =#{qo.userName}
</if>
<if test="qo.searchVal == 'YWJJ' ">
-- 由我解决
and resolvedBy =#{qo.userName}
and status= 'resolved'
and s.status= 'resolved'
</if>
<if test="qo.searchVal == 'YWZP' ">
-- 由我指派
and openedBy =#{qo.userName}
and s.openedBy =#{qo.userName}
</if>
<if test="qo.searchVal == 'WJJ' ">
-- //未解决
and status= 'active'
and s.status= 'active'
</if>
<if test="qo.searchVal == 'WQR' ">
-- //未确认
and confirmed= 0
and s.confirmed= 0
</if>
<if test="qo.searchVal == 'WZP' ">
-- //未指派
and assignedTo is null
and s.assignedTo is null
</if>

49
src/main/resources/mapper/ZtDevelopFeedbackMapper.xml Normal file
View File

@ -0,0 +1,49 @@
<?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.ZtDevelopFeedbackMapper">
<resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtDevelopFeedback">
<result column="id" property="id" />
<result column="product_id" property="productId" />
<result column="level" property="level" />
<result column="propose_time" property="proposeTime" />
<result column="assigned_to" property="assignedTo" />
<result column="remark" property="remark" />
<result column="analysis_remark" property="analysisRemark" />
<result column="handle_remark" property="handleRemark" />
<result column="create_user" property="createUser" />
<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
<result column="update_user" property="updateUser" />
</resultMap>
<select id="pageList" resultType="com.sa.zentao.dao.ZtDevelopFeedbackDTO">
SELECT fb.*,p.`name` as productName from zt_develop_feedback fb,zt_product p WHERE 1=1 and fb.product_id = p.id
<if test="qo.title != null and qo.title != '' ">
and p.name like concat('%', #{qo.title}, '%')
</if>
<if test="qo.startDate!=null ">
and fb.create_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate!=null ">
and fb.create_date <![CDATA[<=]]> #{qo.endDate}
</if>
<if test="qo.productId != null ">
and p.id =#{qo.productId}
</if>
order by id desc
</select>
<select id="myFeedbackList" resultType="com.sa.zentao.dao.ZtDevelopFeedbackDTO">
SELECT fb.*,p.`name` as productName from zt_develop_feedback fb,zt_product p WHERE 1=1 and fb.product_id = p.id
<if test="qo.userName != null and qo.userName != '' ">
and fb.create_user = #{qo.userName}
</if>
order by fb.id desc
limit 10
</select>
</mapper>

42
src/main/resources/mapper/ZtMeetingMapper.xml Normal file
View File

@ -0,0 +1,42 @@
<?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.ZtMeetingMapper">
<resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtMeeting">
<result column="id" property="id" />
<result column="product_id" property="productId" />
<result column="name" property="name" />
<result column="type" property="type" />
<result column="meeting_date" property="meetingDate" />
<result column="users" property="users" />
<result column="remark" property="remark" />
<result column="create_user" property="createUser" />
<result column="create_date" property="createDate" />
<result column="update_user" property="updateUser" />
<result column="update_date" property="updateDate" />
</resultMap>
<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
WHERE 1=1
<if test="qo.productId != null ">
and m.product_id =#{qo.productId}
</if>
<if test="qo.type != null ">
and m.type =#{qo.type.code}
</if>
<if test="qo.title != null and qo.title != '' ">
and p.name like concat('%', #{qo.title}, '%')
</if>
<if test="qo.startDate!=null ">
and m.meeting_date <![CDATA[>=]]> #{qo.startDate}
</if>
<if test="qo.endDate!=null ">
and m.meeting_date <![CDATA[<=]]> #{qo.endDate}
</if>
order by m.id desc
</select>
</mapper>