From f0e3ecc142e86bbf0aaba2b83ff2eee04658caf2 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Tue, 25 Mar 2025 11:36:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(business):=20=E4=BF=AE=E6=AD=A3=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=BD=9C=E6=97=B6=E9=95=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?-=20=E5=B0=86=E7=89=88=E6=9C=AC=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BB=8E=20"2"=20=E4=BF=AE=E6=94=B9=E4=B8=BA=20"0"?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E6=AD=A3=E7=A1=AE=E8=A1=A8=E7=A4=BA=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9C=A8=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=B1=82=E7=BA=A7=20-=20=E5=9C=A8=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9C=8D=E5=8A=A1=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=8E=B7=E5=8F=96=E6=AF=8F?= =?UTF-8?q?=E6=97=A5=E5=B7=A5=E4=BD=9C=E6=97=B6=E9=95=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?-=20=E6=B3=A8=E9=87=8A=E6=8E=89=E5=AD=97=E5=85=B8=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E8=8E=B7=E5=8F=96=E6=AF=8F=E6=97=A5=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=B6=E9=95=BF=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E5=87=86=E5=A4=87=E6=9B=BF=E6=8D=A2=E4=B8=BA=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version/service/impl/ProjectVersionServiceImpl.java | 2 +- .../work/logger/service/impl/WorkLoggerServiceImpl.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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