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 ed1764326..d4a96f4d1 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 @@ -474,12 +474,16 @@ public class PmsProjectServiceImpl implements IPmsProjectService // 获取 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); } + if (dataObj.containsKey("last_week_close_data")) { + JSONObject lastWeekCloseData = dataObj.getJSONObject("last_week_close_data"); + Integer openLastWeekIterationCount = pmsProjectSprintMapper.selectOpeningSprintLastWeekIterationCount(pmProjectId); + lastWeekCloseData.put("0", openLastWeekIterationCount); //近一周新增 + dataObj.put("last_week_close_data", lastWeekCloseData); + } return dataObj; } 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 3cd922737..cc528b3bd 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 @@ -187,13 +187,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"