diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java index 2575342..a65feb2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java @@ -20,8 +20,17 @@ public class ImprovementDeptScoreBpmDTO { @Schema(description = "当前流程任务ID") private String taskId; - @Schema(description = "改善效果得分,0-100") - private BigDecimal effectScore; + @Schema(description = "安全得分,0-100") + private BigDecimal safetyScore; + + @Schema(description = "质量得分,0-100") + private BigDecimal qualityScore; + + @Schema(description = "效率得分,0-100") + private BigDecimal efficiencyScore; + + @Schema(description = "成本得分,0-100") + private BigDecimal costScore; @Schema(description = "可推广度得分,0-100") private BigDecimal promotionScore; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java index 2b18d21..2edf323 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java @@ -50,6 +50,22 @@ public class ImprovementDeptScore implements Serializable { @Excel(name = "评分状态:pending/completed", width = 15) @Schema(description = "评分状态:pending/completed") private String scoreStatus; + /**安全得分*/ + @Excel(name = "安全得分", width = 15) + @Schema(description = "安全得分") + private java.math.BigDecimal safetyScore; + /**质量得分*/ + @Excel(name = "质量得分", width = 15) + @Schema(description = "质量得分") + private java.math.BigDecimal qualityScore; + /**效率得分*/ + @Excel(name = "效率得分", width = 15) + @Schema(description = "效率得分") + private java.math.BigDecimal efficiencyScore; + /**成本得分*/ + @Excel(name = "成本得分", width = 15) + @Schema(description = "成本得分") + private java.math.BigDecimal costScore; /**改善效果得分*/ @Excel(name = "改善效果得分", width = 15) @Schema(description = "改善效果得分") diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java index 4018ef0..1ffa739 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java @@ -231,14 +231,16 @@ public class ImprovementProposalServiceImpl extends ServiceImpl