Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Merge pull request 'fix(软件工厂): 最多缺陷个人改为最多缺陷解决个人；测试用例执行数统计错误' (#852) from liuhuazhong/microservices:xjy_software_fact_statis into xjy_software_fact_statis

This commit is contained in:
wanjia9506 2025-03-25 10:23:48 +08:00
parent 5ae14817fd c0a5ff23fe
commit 24b98366ab
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java
View File

@ -114,7 +114,8 @@ public class SoftwareFactStatisticsServiceImpl extends BaseController {
Long bugMaxProjectId = statisForgeMapper.countForgeProjectByProject(f2); Long bugMaxProjectId = statisForgeMapper.countForgeProjectByProject(f2);
ZonePmsProject bugMaxProject = statisPmsMapper.selectPmsProjectById(bugMaxProjectId); ZonePmsProject bugMaxProject = statisPmsMapper.selectPmsProjectById(bugMaxProjectId);
res.put("bugMaxProject", bugMaxProject == null ?"": bugMaxProject.getProjectName()); res.put("bugMaxProject", bugMaxProject == null ?"": bugMaxProject.getProjectName());
//缺陷最多个人 //缺陷解决最多个人
f2.setStatusIds(ISSUE_FINISHED);
Long bugMaxAssignerId = statisForgeMapper.countForgeProjectByAssigner(f2); Long bugMaxAssignerId = statisForgeMapper.countForgeProjectByAssigner(f2);
String bugMaxAssigner = statisPmsMapper.selectPmsUserByGitlinkId(bugMaxAssignerId); String bugMaxAssigner = statisPmsMapper.selectPmsUserByGitlinkId(bugMaxAssignerId);
res.put("bugMaxAssigner", bugMaxAssigner); res.put("bugMaxAssigner", bugMaxAssigner);
@ -162,9 +163,9 @@ public class SoftwareFactStatisticsServiceImpl extends BaseController {
res.put("yesterdayFinishNeed", yesterdayFinishNeed); res.put("yesterdayFinishNeed", yesterdayFinishNeed);
//昨日测试用例执行 //昨日测试用例执行
ForgeProject forgeProjectTest = new ForgeProject(); ForgeProject forgeProjectTest = new ForgeProject();
forgeProjectFinish.setStatusIds(Arrays.asList(TASK_CASE_STATUS_PASS, TASK_CASE_STATUS_FAIL, TASK_CASE_STATUS_BLOCK, TASK_CASE_STATUS_SKIP)); forgeProjectTest.setStatusIds(Arrays.asList(TASK_CASE_STATUS_PASS, TASK_CASE_STATUS_FAIL, TASK_CASE_STATUS_BLOCK, TASK_CASE_STATUS_SKIP));
forgeProjectFinish.setUpdateTimeS(dayStartAndEnd[0]); forgeProjectTest.setUpdateTimeS(dayStartAndEnd[0]);
forgeProjectFinish.setUpdateTimeE(dayStartAndEnd[1]); forgeProjectTest.setUpdateTimeE(dayStartAndEnd[1]);
Long yesterdayTestCase = statisPmsMapper.countTestCaseInSheet(forgeProjectTest); Long yesterdayTestCase = statisPmsMapper.countTestCaseInSheet(forgeProjectTest);
res.put("yesterdayTestCase", yesterdayTestCase); res.put("yesterdayTestCase", yesterdayTestCase);

6
microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml
View File

@ -93,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="testStatus != null">test_status,</if> <if test="testStatus != null">test_status,</if>
<if test="testerId != null">tester_id,</if> <if test="testerId != null">tester_id,</if>
<if test="stepStatus != null">step_status,</if> <if test="stepStatus != null">step_status,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectTestsheetId != null">#{projectTestsheetId},</if> <if test="projectTestsheetId != null">#{projectTestsheetId},</if>
@ -100,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="testStatus != null">#{testStatus},</if> <if test="testStatus != null">#{testStatus},</if>
<if test="testerId != null">#{testerId},</if> <if test="testerId != null">#{testerId},</if>
<if test="stepStatus != null">#{stepStatus},</if> <if test="stepStatus != null">#{stepStatus},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
</trim> </trim>
</insert> </insert>
@ -110,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectTestcaseId != null">project_testcase_id = #{projectTestcaseId},</if> <if test="projectTestcaseId != null">project_testcase_id = #{projectTestcaseId},</if>
<if test="testStatus != null">test_status = #{testStatus},</if> <if test="testStatus != null">test_status = #{testStatus},</if>
<if test="stepStatus != null">step_status = #{stepStatus},</if> <if test="stepStatus != null">step_status = #{stepStatus},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
tester_id = #{testerId} tester_id = #{testerId}
</trim> </trim>
where id = #{id} where id = #{id}

8
microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml
View File

@ -46,10 +46,10 @@
select id from pms_project_testsheet where pms_project_id = #{pmProjectId} select id from pms_project_testsheet where pms_project_id = #{pmProjectId}
) )
</if> </if>
<if test="createTimeS != null ">and created_on &gt;= #{createTimeS}</if> <if test="createTimeS != null ">and create_time &gt;= #{createTimeS}</if>
<if test="createTimeE != null ">and created_on &lt;= #{createTimeE}</if> <if test="createTimeE != null ">and create_time &lt;= #{createTimeE}</if>
<if test="updateTimeS != null ">and updated_on &gt;= #{updateTimeS}</if> <if test="updateTimeS != null ">and update_time &gt;= #{updateTimeS}</if>
<if test="updateTimeE != null ">and updated_on &lt;= #{updateTimeE}</if> <if test="updateTimeE != null ">and update_time &lt;= #{updateTimeE}</if>
</where> </where>
</select> </select>