From 992426906a0b81ee86cce0a8e5e4f646b0931b52 Mon Sep 17 00:00:00 2001
From: qqkj <qqkj@163.com>
Date: Fri, 16 Apr 2021 21:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=80=99=E9=80=89=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/XmProjectPhaseService.java   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
index 0287ee84..c1172171 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
@@ -40,7 +40,10 @@ public class XmProjectPhaseService extends BaseService {
 	 * 判断新增预算是否超出项目总预算
 	 * @param projectId
 	 * @param addPhaseBudgetCost
-	 * @param excludePhaseId
+	 * @param addPhaseBudgetInnerUserAt
+	 * @param addPhaseBudgetOutUserAt
+	 * @param addPhaseBudgetNouserAt
+	 * @param excludePhaseIds
 	 * @return
 	 */
 	public Tips judgetBudget(String projectId,BigDecimal addPhaseBudgetCost,BigDecimal addPhaseBudgetInnerUserAt,BigDecimal addPhaseBudgetOutUserAt,BigDecimal addPhaseBudgetNouserAt,List<String> excludePhaseIds){
@@ -71,26 +74,25 @@ public class XmProjectPhaseService extends BaseService {
 		BigDecimal planInnerUserAt=NumberUtil.getBigDecimal(g.get("planInnerUserAt"),zero);
 		BigDecimal planOutUserAt=NumberUtil.getBigDecimal(g.get("planOutUserAt"),zero); 
 		BigDecimal planNouserAt=NumberUtil.getBigDecimal(g.get("planNouserAt"),zero); 
-		BigDecimal planTotalCost=NumberUtil.getBigDecimal(g.get("planTotalCost"),zero);  
-		
-		
+		BigDecimal planTotalCost=NumberUtil.getBigDecimal(g.get("planTotalCost"),zero);
+
 		if(addPhaseBudgetInnerUserAt.add(phaseBudgetInnerUserAt).compareTo(planInnerUserAt)>0) {
-			tips.setFailureMsg("内部人力预算超出项目内部人力预算");
+			tips.setFailureMsg("内部人力预算超出项目内部人力预算"+addPhaseBudgetInnerUserAt.add(phaseBudgetInnerUserAt).subtract(planInnerUserAt)+"元");
 			return tips;
 		}
 		if(addPhaseBudgetOutUserAt.add(phaseBudgetOutUserAt).compareTo(planOutUserAt)>0) {
-			tips.setFailureMsg("外部人力预算超出项目外部人力预算");
+			tips.setFailureMsg("外部人力预算超出项目外部人力预算"+addPhaseBudgetOutUserAt.add(phaseBudgetOutUserAt).subtract(planOutUserAt)+"元");
 			return tips;
 		}		
 		if(addPhaseBudgetNouserAt.add(phaseBudgetNouserAt).compareTo(planNouserAt)>0) {
-			tips.setFailureMsg("非人力预算超出项目非人力预算");
+			tips.setFailureMsg("非人力预算超出项目非人力预算"+addPhaseBudgetNouserAt.add(phaseBudgetNouserAt).subtract(planNouserAt)+"元");
 			return tips;
 		}
 		
 		BigDecimal phaseBudgetCostAt=phaseBudgetCost.add(phaseBudgetInnerUserAt).add(phaseBudgetOutUserAt).add(phaseBudgetNouserAt);  
 		phaseBudgetCostAt=phaseBudgetCostAt.add(addPhaseBudgetCost);
 		if(phaseBudgetCostAt.compareTo(planTotalCost)>0) {
-			tips.setFailureMsg("阶段计划总体预算超出项目总预算");
+			tips.setFailureMsg("阶段计划总体预算超出项目总预算"+phaseBudgetCostAt.subtract(planTotalCost)+"元");
 			return tips;
 		}else {
 			return tips;
@@ -110,7 +112,7 @@ public class XmProjectPhaseService extends BaseService {
 	} 
 	/**
 	 * 计算bug、task、测试案例、等数据
-	 * @param productId
+	 * @param projectId
 	 * @return
 	 */
 	public int loadTasksToXmProjectPhase(String projectId) {