caipin il y a 4 ans
Parent
commit
4acde8d99a
1 fichiers modifiés avec 18 ajouts et 12 suppressions
  1. 18 12
      comm/functions.go

+ 18 - 12
comm/functions.go

@@ -81,14 +81,16 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 		safeTotal := 0
 		safeTotalRectification := 0
 		safeTotalRectificationIn := 0
-		SafeTotalApproval := 0
-		SafeTotalClose := 0
+		safeTotalRectificationFinish := 0
+		safeTotalApproval := 0
+		safeTotalClose := 0
 		// 1-6 质量巡检
 		qualityTotal := 0
 		qualityTotalRectification := 0
 		qualityTotalRectificationIn := 0
-		QualityTotalApproval := 0
-		QualityTotalClose := 0
+		qualityTotalRectificationFinish := 0
+		qualityTotalApproval := 0
+		qualityTotalClose := 0
 
 		for _, v := range childs { //查询子节点的子节点,并添加到子节点
 			_, has := HaveChildContract(Data, v)
@@ -127,15 +129,17 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 			safeTotal = safeTotal + v.SafeTotal
 			safeTotalRectification = safeTotalRectification + v.SafeRectification
 			safeTotalRectificationIn = safeTotalRectificationIn + v.SafeRectificationIn
-			SafeTotalApproval = SafeTotalApproval + v.SafeApproval
-			SafeTotalClose = SafeTotalClose + v.SafeClose
+			safeTotalRectificationFinish = safeTotalRectificationFinish + v.SafeRectificationFinish
+			safeTotalApproval = safeTotalApproval + v.SafeApproval
+			safeTotalClose = safeTotalClose + v.SafeClose
 
 			// 1-6 质量巡检
 			qualityTotal = safeTotal + v.QualityTotal
 			qualityTotalRectification = safeTotalRectification + v.QualityRectification
 			qualityTotalRectificationIn = safeTotalRectificationIn + v.QualityRectificationIn
-			QualityTotalApproval = QualityTotalApproval + v.QualityApproval
-			QualityTotalClose = QualityTotalClose + v.QualityClose
+			qualityTotalRectificationFinish = qualityTotalRectificationFinish + v.QualityRectificationFinish
+			qualityTotalApproval = qualityTotalApproval + v.QualityApproval
+			qualityTotalClose = qualityTotalClose + v.QualityClose
 		}
 
 		node.ContractsIncome = fmt.Sprintf("%G", totalIncome)
@@ -158,15 +162,17 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 		node.SafeTotal = safeTotal
 		node.SafeRectification = safeTotalRectification
 		node.SafeRectificationIn = safeTotalRectificationIn
-		node.SafeApproval = SafeTotalApproval
-		node.SafeClose = SafeTotalClose
+		node.SafeRectificationFinish = safeTotalRectificationFinish
+		node.SafeApproval = safeTotalApproval
+		node.SafeClose = safeTotalClose
 
 		// 质量巡检
 		node.QualityTotal = qualityTotal
 		node.QualityRectification = qualityTotalRectification
 		node.QualityRectificationIn = qualityTotalRectificationIn
-		node.QualityApproval = QualityTotalApproval
-		node.QualityClose = QualityTotalClose
+		node.QualityRectificationFinish = qualityTotalRectificationFinish
+		node.QualityApproval = qualityTotalApproval
+		node.QualityClose = qualityTotalClose
 	}
 }