1

comm/functions.go

@@ -142,7 +142,7 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 			qualityTotalClose = qualityTotalClose + v.QualityClose
 		}
 
-		node.ContractsIncome = fmt.Sprintf("%G", totalIncome)
+		node.ContractsIncome = fmt.Sprintf("%.2f", totalIncome)
 		node.Contracts = totalContractNumber
 		// 汇款进度
 		quotient := totalReturn / totalIncome
@@ -152,7 +152,7 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 		node.ContractsIncomeProgress = fmt.Sprintf("%.0f", (quotient)*100) + "%"
 		// 支出相关
 		// node.ContractsPay =  fmt.Sprintf("%.2f", totalPay)
-		node.ContractsPay = fmt.Sprintf("%G", totalPay)
+		node.ContractsPay = fmt.Sprintf("%.2f", totalPay)
 		quotient = totalPaid / totalPay
 		if math.IsNaN(quotient) {
 			quotient = 0

services/contract_paid_service.go

@@ -9,7 +9,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strconv"
 	"time"
@@ -19,6 +18,7 @@ import (
 	"go.mod/comm"
 	"go.mod/conf"
 	"go.mod/models"
+	"go.mod/web/utils"
 	"go.mod/web/viewmodels"
 )
 
@@ -218,7 +218,8 @@ func (s *contractService) makeContractPaidVM(data *models.CmContractsPaid) *view
 	viewContractsReturn.Time = data.Time.Format(conf.SysTimeform)
 
 	price, _ := strconv.ParseFloat(data.Price, 64)
-	viewContractsReturn.Price = fmt.Sprintf("%G", price)
+
+	viewContractsReturn.Price = utils.PriceToStringFormat(price)
 
 	viewContractsReturn.Way = data.Way
 	viewContractsReturn.CreateUser = data.CreateUser

services/contract_return_service.go

@@ -9,7 +9,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strconv"
 	"time"
@@ -19,6 +18,7 @@ import (
 	"go.mod/comm"
 	"go.mod/conf"
 	"go.mod/models"
+	"go.mod/web/utils"
 	"go.mod/web/viewmodels"
 )
 
@@ -36,7 +36,7 @@ func (s *contractService) makeContractRetrunVM(data *models.CmContractsReturn) *
 	viewContractsReturn.Time = data.Time.Format(conf.SysTimeform)
 
 	price, _ := strconv.ParseFloat(data.Price, 64)
-	viewContractsReturn.Price = fmt.Sprintf("%G", price)
+	viewContractsReturn.Price = utils.PriceToStringFormat(price)
 
 	viewContractsReturn.Way = data.Way
 	viewContractsReturn.CreateUser = data.CreateUser

services/contract_service.go

@@ -701,13 +701,13 @@ func (s *contractService) makeContractVM(contract *models.CmContracts) viewmodel
 	contractsVM.PartyBSigner = contract.PartyBSigner
 	contractsVM.Remarks = contract.Remarks
 
-	price, _ := strconv.ParseFloat(contract.Price, 64)
-	returned, _ := strconv.ParseFloat(contract.Returned, 64)
-	paid, _ := strconv.ParseFloat(contract.Paid, 64)
+	// price, _ := strconv.ParseFloat(contract.Price, 64)
+	// returned, _ := strconv.ParseFloat(contract.Returned, 64)
+	// paid, _ := strconv.ParseFloat(contract.Paid, 64)
 
-	contractsVM.Price = fmt.Sprintf("%G", price)
-	contractsVM.Returned = fmt.Sprintf("%G", returned)
-	contractsVM.Paid = fmt.Sprintf("%G", paid)
+	contractsVM.Price = contract.Price
+	contractsVM.Returned = contract.Returned
+	contractsVM.Paid = contract.Paid
 	contractsVM.Status = contract.Status
 	contractsVM.Locking = contract.Locking
 

services/safe_service.go

@@ -391,14 +391,13 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 					approverVM.BidsectionName = bidSectionDetail.Name
 					approverVM.CreateTime = data.CreateTime
 					approverVM.UpdateTime = item.UpdateTime
-
 					break
 				}
 			}
 		} else if item.DataType == 2 { // 质量巡检
 			for _, data := range qualityList {
 				if dataIdString == data.Id {
-					bidSectionDetail := s.daoBidsection.Get(projectId, data.BidsectionId)
+					bidSectionDetail := s.daoBidsection.Get(data.BidsectionId, projectId)
 					approverVM.Code = data.Code
 					approverVM.InspectionDetail = data.InspectionDetail
 					approverVM.Name = data.AuditName

services/tree_service.go

@@ -20,6 +20,7 @@ import (
 	"go.mod/dao"
 	"go.mod/datasource"
 	"go.mod/models"
+	"go.mod/web/utils"
 	"go.mod/web/viewmodels"
 )
 
@@ -220,8 +221,8 @@ func (s *treeService) GetAllContract(projectId int, account *models.CmProjectAcc
 			contractsIncome, _ := strconv.ParseFloat(data.ContractsIncome, 64)
 			contractsReturned, _ := strconv.ParseFloat(data.ContractsReturned, 64)
 
-			folder.ContractsIncome = fmt.Sprintf("%G", contractsIncome)
-			folder.ContractsReturned = fmt.Sprintf("%G", contractsReturned)
+			folder.ContractsIncome = utils.PriceToStringFormat(contractsIncome)
+			folder.ContractsReturned = utils.PriceToStringFormat(contractsReturned)
 			// 汇款进度
 			ContractsIncome, err := strconv.ParseFloat(data.ContractsIncome, 64)
 			if err != nil {
@@ -238,8 +239,8 @@ func (s *treeService) GetAllContract(projectId int, account *models.CmProjectAcc
 			contractsPay, _ := strconv.ParseFloat(data.ContractsPay, 64)
 			contractsPaid, _ := strconv.ParseFloat(data.ContractsPaid, 64)
 
-			folder.ContractsPay = fmt.Sprintf("%G", contractsPay)
-			folder.ContractsPaid = fmt.Sprintf("%G", contractsPaid)
+			folder.ContractsPay = utils.PriceToStringFormat(contractsPay)
+			folder.ContractsPaid = utils.PriceToStringFormat(contractsPaid)
 			// 支付进度
 			ContractsPay, err := strconv.ParseFloat(data.ContractsPay, 64)
 			if err != nil {

web/utils/utils.go

@@ -87,6 +87,11 @@ func GetDecryptId(id string) (int, error) {
 	return idInt, nil
 }
 
+// 金额转字符串 保留2位小数
+func PriceToStringFormat(price float64) string {
+	return fmt.Sprintf("%.2f", price)
+}
+
 // 生成code
 func CreateRuleCode(code int64, count int64, len int) string {
 	// fmt.Println("rule", rule, "counts", count)