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