diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java index 4ee27c79..13f9d819 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java @@ -130,5 +130,9 @@ public class SpdmNodeVo extends BaseEntity { * 已闭环任务数 */ private Integer taskClosedLoopCount; + /** + * 完成进度 (已完成任务数+已闭环任务数)/ 任务总数 + */ + private String progressNum; } diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index a6bc1254..414c7edd 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -766,6 +766,17 @@ public class NodeServiceImpl extends ServiceImpl 0) { + double progress = (double) (taskClosedLoop + taskCompleted) / taskTotal * 100; + int progressPercent = (int) Math.ceil(progress); + node.setProgressNum(progressPercent + "%"); + } else { + node.setProgressNum("0%"); + } } }