|
@@ -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 {
|