1

dao/contract_paid_dao.go

@@ -40,10 +40,10 @@ func (d *ContractPaidDao) Get(id int, contractsId int, bidsectionId int) *models
 
 }
 
-func (d *ContractPaidDao) GetInContractsIds(ids string) []models.CmContractsPaid {
+func (d *ContractPaidDao) GetInContractsIds(ids []int) []models.CmContractsPaid {
 	datalist := make([]models.CmContractsPaid, 0)
 	d.engine.
-		Where("contracts_id in ( ? ) ", ids).
+		In("contracts_id", ids).
 		Desc("id").
 		Find(&datalist)
 	return datalist

dao/contract_return_dao.go

@@ -40,10 +40,10 @@ func (d *ContractReturnDao) Get(id int, contractsId int, bidsectionId int) *mode
 
 }
 
-func (d *ContractReturnDao) GetInContractsIds(ids string) []models.CmContractsReturn {
+func (d *ContractReturnDao) GetInContractsIds(ids []int) []models.CmContractsReturn {
 	datalist := make([]models.CmContractsReturn, 0)
 	d.engine.
-		Where("contracts_id in ( ? ) ", ids).
+		In("contracts_id", ids).
 		Desc("id").
 		Find(&datalist)
 	return datalist

go.sum

@@ -354,6 +354,7 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUWQxHW5TkBe7YUl+2s=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=

services/contract_service.go

@@ -12,7 +12,6 @@ import (
 	"html"
 	"log"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/kataras/iris/v12"
@@ -576,13 +575,13 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
 		fmt.Sprintf("%d-12", year): 0.00,
 	}
 
-	contractIds := []string{}
+	contractIds := []int{}
 	for _, item := range incomeList {
 		contractPrice, _ := strconv.ParseFloat(item.Price, 64)
 		totalContractPrice = totalContractPrice + contractPrice
 
 		// 回款金额或已支付金额合计
-		contractIds = append(contractIds, strconv.Itoa(item.Id))
+		contractIds = append(contractIds, item.Id)
 
 		// typePrice := 0.00
 		// if contractsType == 1 {
@@ -604,20 +603,22 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
 		// returnDate[item.CreateTime.Format(conf.SysTimeformMonth)] = returnDate[item.CreateTime.Format(conf.SysTimeformMonth)] + typePrice
 	}
 
-	contractInId := strings.Join(contractIds, ",")
+	fmt.Println(contractIds)
+	// contractInId := strings.Join(contractIds, ",")
 	if contractsType == 1 {
-		list := s.contractReturnDao.GetInContractsIds(contractInId)
+		list := s.contractReturnDao.GetInContractsIds(contractIds)
 		for _, item := range list {
 			typePrice := 0.00
 			typePrice, _ = strconv.ParseFloat(item.Price, 64)
 			totalTypePrice = totalTypePrice + typePrice
 
+			fmt.Println(item)
 			// :=decimal.NewFromFloat(typePrice)
 
 			returnDate[item.Time.Format(conf.SysTimeformMonth)], _ = decimal.NewFromFloat(returnDate[item.Time.Format(conf.SysTimeformMonth)]).Add(decimal.NewFromFloat(typePrice)).Float64()
 		}
 	} else {
-		list := s.contractPaidDao.GetInContractsIds(contractInId)
+		list := s.contractPaidDao.GetInContractsIds(contractIds)
 		for _, item := range list {
 			typePrice := 0.00
 			typePrice, _ = strconv.ParseFloat(item.Price, 64)

web/utils/utils.go

@@ -89,7 +89,10 @@ func GetDecryptId(id string) (int, error) {
 
 // 金额转字符串 保留2位小数
 func PriceToStringFormat(price float64) string {
+	// fmt.Println("price=========================")
+	// fmt.Println(price)
 	return fmt.Sprintf("%.2f", price)
+	// return fmt.Sprintf("%g", price)
 }
 
 // 生成code