|
@@ -15,7 +15,6 @@ import (
|
|
"time"
|
|
"time"
|
|
|
|
|
|
"github.com/kataras/iris/v12"
|
|
"github.com/kataras/iris/v12"
|
|
- "github.com/leekchan/accounting"
|
|
|
|
"go.mod/comm"
|
|
"go.mod/comm"
|
|
"go.mod/conf"
|
|
"go.mod/conf"
|
|
"go.mod/dao"
|
|
"go.mod/dao"
|
|
@@ -566,11 +565,11 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
|
|
totalContractPrice, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalContractPrice), 64)
|
|
totalContractPrice, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalContractPrice), 64)
|
|
totalTypePrice, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalTypePrice), 64)
|
|
totalTypePrice, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalTypePrice), 64)
|
|
|
|
|
|
- ac := accounting.Accounting{Symbol: "", Precision: 2}
|
|
|
|
|
|
+ // ac := accounting.Accounting{Symbol: "", Precision: 2}
|
|
|
|
|
|
surveryData := map[string]interface{}{
|
|
surveryData := map[string]interface{}{
|
|
"totalContractPrice": totalContractPrice,
|
|
"totalContractPrice": totalContractPrice,
|
|
- "totalContractPriceShow": ac.FormatMoney(totalContractPrice),
|
|
|
|
|
|
+ "totalContractPriceShow": totalContractPrice,
|
|
// "totalReturnPrice": ac.FormatMoney(totalReturnPrice),
|
|
// "totalReturnPrice": ac.FormatMoney(totalReturnPrice),
|
|
"performNumber": performNumber,
|
|
"performNumber": performNumber,
|
|
"closeNumber": closeNumber,
|
|
"closeNumber": closeNumber,
|
|
@@ -579,9 +578,9 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
|
|
}
|
|
}
|
|
|
|
|
|
if contractsType == 1 {
|
|
if contractsType == 1 {
|
|
- surveryData["totalReturnPriceShow"] = ac.FormatMoney(totalTypePrice)
|
|
|
|
|
|
+ surveryData["totalReturnPriceShow"] = totalTypePrice
|
|
} else {
|
|
} else {
|
|
- surveryData["totalPaidPriceShow"] = ac.FormatMoney(totalTypePrice)
|
|
|
|
|
|
+ surveryData["totalPaidPriceShow"] = totalTypePrice
|
|
}
|
|
}
|
|
|
|
|
|
return surveryData
|
|
return surveryData
|