diff --git a/pms-business/src/main/java/tech/unissense/pms/business/version/service/impl/ProjectVersionServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/version/service/impl/ProjectVersionServiceImpl.java index 2137abc..7fd9b6a 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/version/service/impl/ProjectVersionServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/version/service/impl/ProjectVersionServiceImpl.java @@ -113,7 +113,7 @@ public class ProjectVersionServiceImpl implements IProjectVersionService { VersionTreeVo node = new VersionTreeVo(); node.setId(version.getId()); node.setTitle(version.getVersionNumber()); - node.setType("2"); + node.setType("0"); // 转换关联需求为子节点(类型1) node.setChildrenList( versionIdMap.getOrDefault(version.getId(), Collections.emptyList()) diff --git a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java index 4d0377b..71048c2 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/work/logger/service/impl/WorkLoggerServiceImpl.java @@ -12,7 +12,9 @@ import tech.unissense.pms.business.work.logger.service.IWorkLoggerService; import tech.unissense.pms.business.work.logger.vo.CalendarVo; import tech.unissense.pms.business.work.logger.vo.StaticsHourVo; import tech.unissense.pms.common.utils.DateUtils; +import tech.unissense.pms.common.utils.DictUtils; import tech.unissense.pms.common.utils.SecurityUtils; +import tech.unissense.pms.system.service.ISysConfigService; import java.util.*; @@ -36,6 +38,8 @@ public class WorkLoggerServiceImpl implements IWorkLoggerService { @Autowired private IProjectService projectService; + @Autowired + private ISysConfigService configService; /** * 通过ID查询单条数据 * @@ -218,9 +222,10 @@ public class WorkLoggerServiceImpl implements IWorkLoggerService { BigDecimal totalWorkTime = list.stream() .map(item->new BigDecimal(item.getWorkTime())) // 假设WorkLogger有getWorkTime方法返回BigDecimal .reduce(BigDecimal.ZERO, BigDecimal::add); - + String configByKey = configService.selectConfigByKey("pms.work.dayTime"); +// String dictLabel = DictUtils.getDictLabel("work_logger", "day_work_time"); // 返回总和的字符串表示 - return BigDecimal.ONE.subtract(totalWorkTime).toString(); + return new BigDecimal(configByKey).subtract(totalWorkTime).toString(); } @Override