1

dao/safe_dao.go

@@ -101,6 +101,16 @@ func (d *SafeDao) GetStatus(bidsectionId int, status int) []models.CmSafe {
 	return datalist
 }
 
+// 获得某状态下的安全
+// func (d *SafeDao) GetStatusByProjectAndAccount(projectId int, projectAccountId int, status int) []models.CmSafe {
+// 	datalist := make([]models.CmSafe, 0)
+// 	_ = d.engine.
+// 		Where("bidsection_id = ? and status=? ", bidsectionId, status).
+// 		Desc("id").
+// 		Find(&datalist)
+// 	return datalist
+// }
+
 // 获得某年份下的安全
 func (d *SafeDao) GetTypeYear(bidsectionId int, year int) []viewmodels.SafeSurveyList {
 

services/contract_service.go

@@ -519,7 +519,7 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
 	// 1.获得收入合同
 	year := time.Now().Year()
 	incomeList := s.contractDao.GetTypeYear(bidsectionId, projectId, contractsType, year)
-	fmt.Println(incomeList)
+
 	// 2.初始化
 	totalContractPrice := 0.00
 	totalTypePrice := 0.00
@@ -561,7 +561,8 @@ func (s *contractService) GetSurvey(bidsectionId int, projectId int, contractsTy
 		} else if item.Status == 2 {
 			closeNumber = closeNumber + 1
 		}
-		returnDate[item.SignerTime.Format(conf.SysTimeformMonth)] = returnDate[item.SignerTime.Format(conf.SysTimeformMonth)] + typePrice
+
+		returnDate[item.CreateTime.Format(conf.SysTimeformMonth)] = returnDate[item.CreateTime.Format(conf.SysTimeformMonth)] + typePrice
 	}
 	totalContractPrice, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalContractPrice), 64)
 	totalTypePrice, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalTypePrice), 64)