diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java index 7e5370db2..9c4210ffb 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java @@ -73,4 +73,8 @@ public interface PmsProjectSprintMapper int deletePmsProjectSprintByProjectId(@Param("projectId") Long projectId); PmsProjectSprint selectLatestSprintByProjectIdAndNameAndAssigneeId(@Param("pmsProjectId") Long pmsProjectId, @Param("sprintName") String sprintName, @Param("sprintAssigneeId") Long sprintAssigneeId); + + Integer selectOpeningSprintCount(@Param("pmProjectId") Long pmProjectId); + + Integer selectOpeningSprintLastWeekIterationCount(@Param("pmProjectId") Long pmProjectId); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java index de1f13385..8ff606055 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java @@ -436,7 +436,18 @@ public class PmsProjectServiceImpl implements IPmsProjectService // 校验数据权限 selectAndCheckPmsProjectById(pmProjectId); JSONObject result = gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_PROJECT_STATISTICS(pmProjectId)); - return result.getJSONObject(DATA_KEY); + JSONObject dataObj = result.getJSONObject(DATA_KEY); + if (dataObj.containsKey("open_data")) { + // 获取 open_data 对象 + JSONObject openData = dataObj.getJSONObject("open_data"); + Integer openSprintCount = pmsProjectSprintMapper.selectOpeningSprintCount(pmProjectId); + Integer openLastWeekIterationCount = pmsProjectSprintMapper.selectOpeningSprintLastWeekIterationCount(pmProjectId); + // 添加新的键值对 + openData.put("0", openSprintCount); // 新增开启中的迭代 + openData.put("0_lastWeekIteration", openLastWeekIterationCount); //近一周新增 + dataObj.put("open_data", openData); + } + return dataObj; } @Override diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml index 7aa6a8d1e..58d09ba99 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml @@ -184,4 +184,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id desc limit 1 + + \ No newline at end of file