diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java index 3f216f91b..0cba35cf5 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java @@ -114,7 +114,8 @@ public class SoftwareFactStatisticsServiceImpl extends BaseController { Long bugMaxProjectId = statisForgeMapper.countForgeProjectByProject(f2); ZonePmsProject bugMaxProject = statisPmsMapper.selectPmsProjectById(bugMaxProjectId); res.put("bugMaxProject", bugMaxProject == null ?"": bugMaxProject.getProjectName()); - //缺陷最多个人 + //缺陷解决最多个人 + f2.setStatusIds(ISSUE_FINISHED); Long bugMaxAssignerId = statisForgeMapper.countForgeProjectByAssigner(f2); String bugMaxAssigner = statisPmsMapper.selectPmsUserByGitlinkId(bugMaxAssignerId); res.put("bugMaxAssigner", bugMaxAssigner); @@ -162,9 +163,9 @@ public class SoftwareFactStatisticsServiceImpl extends BaseController { res.put("yesterdayFinishNeed", yesterdayFinishNeed); //昨日测试用例执行 ForgeProject forgeProjectTest = new ForgeProject(); - forgeProjectFinish.setStatusIds(Arrays.asList(TASK_CASE_STATUS_PASS, TASK_CASE_STATUS_FAIL, TASK_CASE_STATUS_BLOCK, TASK_CASE_STATUS_SKIP)); - forgeProjectFinish.setUpdateTimeS(dayStartAndEnd[0]); - forgeProjectFinish.setUpdateTimeE(dayStartAndEnd[1]); + forgeProjectTest.setStatusIds(Arrays.asList(TASK_CASE_STATUS_PASS, TASK_CASE_STATUS_FAIL, TASK_CASE_STATUS_BLOCK, TASK_CASE_STATUS_SKIP)); + forgeProjectTest.setUpdateTimeS(dayStartAndEnd[0]); + forgeProjectTest.setUpdateTimeE(dayStartAndEnd[1]); Long yesterdayTestCase = statisPmsMapper.countTestCaseInSheet(forgeProjectTest); res.put("yesterdayTestCase", yesterdayTestCase); diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml index b6552b4f6..44d6923e5 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml @@ -93,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" test_status, tester_id, step_status, + create_time, + create_by, #{projectTestsheetId}, @@ -100,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{testStatus}, #{testerId}, #{stepStatus}, + #{createTime}, + #{createBy}, @@ -110,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" project_testcase_id = #{projectTestcaseId}, test_status = #{testStatus}, step_status = #{stepStatus}, + update_time = #{updateTime}, + update_by = #{updateBy}, tester_id = #{testerId} where id = #{id} diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml index 964903987..8b95d63aa 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml @@ -46,10 +46,10 @@ select id from pms_project_testsheet where pms_project_id = #{pmProjectId} ) - and created_on >= #{createTimeS} - and created_on <= #{createTimeE} - and updated_on >= #{updateTimeS} - and updated_on <= #{updateTimeE} + and create_time >= #{createTimeS} + and create_time <= #{createTimeE} + and update_time >= #{updateTimeS} + and update_time <= #{updateTimeE}