feat(business): 修正版本节点类型并添加工作时长配置- 将版本节点类型从 "2" 修改为 "0",以正确表示版本在树形结构中的层级

- 在工作日志服务中添加系统配置服务引用,用于获取每日工作时长配置- 注释掉字典工具类获取每日工作时长的方法,准备替换为系统配置方式
dev_1.2.0
chenhao 2025-03-25 11:36:54 +08:00
parent b2da4c75df
commit f0e3ecc142
2 changed files with 8 additions and 3 deletions

View File

@ -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())

View File

@ -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