From 9a6416f2fda86079062ce4ef13b50d7e59a9a43d Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Tue, 28 Jul 2026 15:05:15 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260728=20=E6=94=B9=E5=96=84=E6=8F=90?=
 =?UTF-8?q?=E6=A1=88=20=E6=94=B9=E5=96=84=E6=95=88=E6=9E=9C=E5=BE=97?=
 =?UTF-8?q?=E5=88=86=E6=8B=86=E5=88=86=E4=B8=BA=E5=AE=89=E5=85=A8=E3=80=81?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E3=80=81=E6=95=88=E7=8E=87=E3=80=81=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E5=9B=9B=E4=B8=AA=EF=BC=8C=E6=9D=83=E9=87=8D=E5=B9=B3?=
 =?UTF-8?q?=E5=9D=87=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/ImprovementDeptScoreBpmDTO.java       | 13 +++++-
 .../entity/ImprovementDeptScore.java          | 16 +++++++
 .../impl/ImprovementProposalServiceImpl.java  | 45 ++++++++++++++-----
 3 files changed, 62 insertions(+), 12 deletions(-)

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<ImprovementPropo
 			throw new IllegalStateException("评分已锁定，请重新提交流程办理");
 		}
 
-		BigDecimal totalScore = calculateTotalScore(scoreAction);
+		// 改善效果由四个子项在服务端计算，避免前端篡改汇总得分或加权总分。
+		BigDecimal effectScore = calculateEffectScore(scoreAction);
+		BigDecimal totalScore = calculateTotalScore(scoreAction, effectScore);
 		if (existingScore == null) {
 			ImprovementDeptScore newScore = new ImprovementDeptScore();
 			newScore.setMainId(lockedProposal.getId());
 			newScore.setProcessTaskId(scoreAction.getTaskId());
 			newScore.setScorerId(loginUser.getId());
 			newScore.setScorerName(loginUser.getRealname());
-			fillDeptScoreDraft(newScore, scoreAction, totalScore);
+			fillDeptScoreDraft(newScore, scoreAction, effectScore, totalScore);
 			improvementDeptScoreMapper.insert(newScore);
 		} else {
 			// 草稿保存只能更新 pending 记录，避免流程已提交后通过接口修改最终评分。
@@ -246,7 +248,11 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
 				.eq(ImprovementDeptScore::getId, existingScore.getId())
 				.eq(ImprovementDeptScore::getScoreStatus, "pending")
 				.set(ImprovementDeptScore::getProcessTaskId, scoreAction.getTaskId())
-				.set(ImprovementDeptScore::getEffectScore, scoreAction.getEffectScore())
+				.set(ImprovementDeptScore::getSafetyScore, scoreAction.getSafetyScore())
+				.set(ImprovementDeptScore::getQualityScore, scoreAction.getQualityScore())
+				.set(ImprovementDeptScore::getEfficiencyScore, scoreAction.getEfficiencyScore())
+				.set(ImprovementDeptScore::getCostScore, scoreAction.getCostScore())
+				.set(ImprovementDeptScore::getEffectScore, effectScore)
 				.set(ImprovementDeptScore::getPromotionScore, scoreAction.getPromotionScore())
 				.set(ImprovementDeptScore::getOriginalityScore, scoreAction.getOriginalityScore())
 				.set(ImprovementDeptScore::getEffortScore, scoreAction.getEffortScore())
@@ -374,7 +380,10 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
 		if (scoreAction == null) {
 			throw new IllegalStateException("评分参数不能为空");
 		}
-		validateScoreValue(scoreAction.getEffectScore(), "改善效果");
+		validateScoreValue(scoreAction.getSafetyScore(), "安全");
+		validateScoreValue(scoreAction.getQualityScore(), "质量");
+		validateScoreValue(scoreAction.getEfficiencyScore(), "效率");
+		validateScoreValue(scoreAction.getCostScore(), "成本");
 		validateScoreValue(scoreAction.getPromotionScore(), "可推广度");
 		validateScoreValue(scoreAction.getOriginalityScore(), "独创性");
 		validateScoreValue(scoreAction.getEffortScore(), "努力度");
@@ -386,16 +395,28 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
 		}
 	}
 
-	private BigDecimal calculateTotalScore(ImprovementDeptScoreBpmDTO scoreAction) {
-		return scoreAction.getEffectScore().multiply(new BigDecimal("0.50"))
+	private BigDecimal calculateEffectScore(ImprovementDeptScoreBpmDTO scoreAction) {
+		return calculateEffectScore(scoreAction.getSafetyScore(), scoreAction.getQualityScore(), scoreAction.getEfficiencyScore(), scoreAction.getCostScore());
+	}
+
+	private BigDecimal calculateEffectScore(BigDecimal safetyScore, BigDecimal qualityScore, BigDecimal efficiencyScore, BigDecimal costScore) {
+		return safetyScore.add(qualityScore).add(efficiencyScore).add(costScore).divide(BigDecimal.valueOf(4), 2, RoundingMode.HALF_UP);
+	}
+
+	private BigDecimal calculateTotalScore(ImprovementDeptScoreBpmDTO scoreAction, BigDecimal effectScore) {
+		return effectScore.multiply(new BigDecimal("0.50"))
 			.add(scoreAction.getPromotionScore().multiply(new BigDecimal("0.20")))
 			.add(scoreAction.getOriginalityScore().multiply(new BigDecimal("0.20")))
 			.add(scoreAction.getEffortScore().multiply(new BigDecimal("0.10")))
 			.setScale(2, RoundingMode.HALF_UP);
 	}
 
-	private void fillDeptScoreDraft(ImprovementDeptScore target, ImprovementDeptScoreBpmDTO source, BigDecimal totalScore) {
-		target.setEffectScore(source.getEffectScore());
+	private void fillDeptScoreDraft(ImprovementDeptScore target, ImprovementDeptScoreBpmDTO source, BigDecimal effectScore, BigDecimal totalScore) {
+		target.setSafetyScore(source.getSafetyScore());
+		target.setQualityScore(source.getQualityScore());
+		target.setEfficiencyScore(source.getEfficiencyScore());
+		target.setCostScore(source.getCostScore());
+		target.setEffectScore(effectScore);
 		target.setPromotionScore(source.getPromotionScore());
 		target.setOriginalityScore(source.getOriginalityScore());
 		target.setEffortScore(source.getEffortScore());
@@ -406,11 +427,15 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
 	}
 
 	private void validateSavedScore(ImprovementDeptScore score) {
-		validateScoreValue(score.getEffectScore(), "改善效果");
+		validateScoreValue(score.getSafetyScore(), "安全");
+		validateScoreValue(score.getQualityScore(), "质量");
+		validateScoreValue(score.getEfficiencyScore(), "效率");
+		validateScoreValue(score.getCostScore(), "成本");
 		validateScoreValue(score.getPromotionScore(), "可推广度");
 		validateScoreValue(score.getOriginalityScore(), "独创性");
 		validateScoreValue(score.getEffortScore(), "努力度");
-		if (score.getTotalScore() == null) {
+		BigDecimal calculatedEffectScore = calculateEffectScore(score.getSafetyScore(), score.getQualityScore(), score.getEfficiencyScore(), score.getCostScore());
+		if (score.getEffectScore() == null || score.getEffectScore().compareTo(calculatedEffectScore) != 0 || score.getTotalScore() == null) {
 			throw new IllegalStateException("请先保存完整个人评分");
 		}
 	}