lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

进度管理大屏

Browse Source
This commit is contained in:
lcj
2025-12-17 16:36:08 +08:00
parent 86951d43b4
commit 4d7df7298a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProgressBigScreenController.java
View File

@ -1,6 +1,5 @@
package org.dromara.bigscreen.controller; package org.dromara.bigscreen.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -27,7 +26,6 @@ import java.util.List;
* @author lilemy * @author lilemy
* @date 2025-12-15 11:35 * @date 2025-12-15 11:35
*/ */
@SaIgnore
@Validated @Validated
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/ProjectImageProgressDetailVo.java
View File

@ -41,6 +41,11 @@ public class ProjectImageProgressDetailVo implements Serializable {
*/ */
private BigDecimal totalProgress; private BigDecimal totalProgress;
/**
* 完成率
*/
private BigDecimal completionRate;
/** /**
* 单位 * 单位
*/ */

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
View File

@ -581,6 +581,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
vo.setPlanProgress(c.getPlanTotal()); vo.setPlanProgress(c.getPlanTotal());
vo.setActualProgress(c.getCompleted()); vo.setActualProgress(c.getCompleted());
vo.setTotalProgress(c.getTotal()); vo.setTotalProgress(c.getTotal());
vo.setCompletionRate(BigDecimalUtil.toPercentage(c.getCompleted(), c.getTotal()));
return vo; return vo;
}).toList(); }).toList();
} }
@ -615,6 +616,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
BigDecimal total = children.stream().map(PgsProgressCategory::getTotal) BigDecimal total = children.stream().map(PgsProgressCategory::getTotal)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
vo.setTotalProgress(total); vo.setTotalProgress(total);
vo.setCompletionRate(BigDecimalUtil.toPercentage(completed, total));
detailVoList.add(vo); detailVoList.add(vo);
}); });
} else { } else {
@ -645,6 +647,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
.filter(Objects::nonNull) .filter(Objects::nonNull)
.findFirst().orElse(null); .findFirst().orElse(null);
vo.setUnit(unit); vo.setUnit(unit);
vo.setCompletionRate(BigDecimalUtil.toPercentage(actual, total));
detailVoList.add(vo); detailVoList.add(vo);
}); });
} }