1

dao/quality_dao.go

@@ -119,3 +119,13 @@ func (d *QualityDao) GetTypeYear(bidsectionId int, year int) []viewmodels.Qualit
 	// 	Find(&datalist)
 	return datalist
 }
+
+// 获得某状态下的安全
+func (d *QualityDao) GetStatusByProjectAndAccount(projectId int, projectAccountId int, status int) []models.CmQuality {
+	datalist := make([]models.CmQuality, 0)
+	_ = d.engine.
+		Where("project_id = ? and audit_id= ? and status=? ", projectId, projectAccountId, status).
+		Desc("id").
+		Find(&datalist)
+	return datalist
+}

dao/safe_dao.go

@@ -105,7 +105,7 @@ 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("projectId = ? and projectAccountId= ? and status=? ", projectId, projectAccountId, status).
+		Where("project_id = ? and audit_id= ? and status=? ", projectId, projectAccountId, status).
 		Desc("id").
 		Find(&datalist)
 	return datalist

services/quality_service.go

@@ -23,6 +23,7 @@ type QualityService interface {
 	Del(id int) error
 	GetDetail(id int, pid int) viewmodels.QualityDetail
 	GetSurvey(projectId int, bidsectionId int) map[string]interface{}
+	GetPending(projectId int, projectAccountId int) []viewmodels.Quality
 	ValidRule(ctx iris.Context) (viewmodels.Quality, error)
 }
 
@@ -295,6 +296,38 @@ func (s *qualityService) GetSurvey(projectId int, bidsectionId int) map[string]i
 	return surveryData
 }
 
+// 获得账号下需要审批的巡检
+func (s *qualityService) GetPending(projectId int, projectAccountId int) []viewmodels.Quality {
+
+	data := s.daoQuality.GetStatusByProjectAndAccount(projectId, projectAccountId, 1)
+
+	safeList := make([]viewmodels.Quality, 0)
+	for _, item := range data {
+		safeVM := viewmodels.Quality{}
+
+		Id, _ := comm.AesEncrypt(strconv.Itoa(item.Id), conf.SignSecret)
+		BidsectionId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
+		// AuditId, _ := comm.AesEncrypt(item.AuditId, conf.SignSecret)
+		Uid, _ := comm.AesEncrypt(strconv.Itoa(item.Uid), conf.SignSecret)
+		// ProjectId, _ := comm.AesEncrypt(strconv.Itoa(item.ProjectId), conf.SignSecret)
+
+		safeVM.Id = Id
+		safeVM.BidsectionId = BidsectionId
+		safeVM.Uid = Uid
+		safeVM.Code = item.Code
+		safeVM.CreateTime = item.CreateTime.Format(conf.SysTimeform)
+		safeVM.EndTime = item.EndTime.Format(conf.SysTimeform)
+		safeVM.Position = item.Position
+		safeVM.Inspection = item.Inspection
+		safeVM.InspectionDetail = item.InspectionDetail
+		safeVM.Demand = item.Demand
+		safeVM.Status = item.Status
+		safeList = append(safeList, safeVM)
+	}
+
+	return safeList
+}
+
 // 规则校验
 func (s *qualityService) ValidRule(ctx iris.Context) (viewmodels.Quality, error) {
 	qualityVaild := viewmodels.Quality{}

services/safe_service.go

@@ -24,7 +24,7 @@ type SafeService interface {
 	GetDetail(id int, pid int) viewmodels.SafeDetail
 
 	GetSurvey(projectId int, bidsectionId int) map[string]interface{}
-	GetPending(projectId int, projectAccountId int) []viewmodels.SafeList
+	GetPending(projectId int, projectAccountId int) []viewmodels.Safe
 	ValidRule(ctx iris.Context) (viewmodels.Safe, error)
 }
 
@@ -318,11 +318,35 @@ func (s *safeService) GetSurvey(projectId int, bidsectionId int) map[string]inte
 }
 
 // 获得账号下需要审批的巡检
-func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmodels.SafeList {
+func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmodels.Safe {
 
-	s.daoSafe.GetStatusByProjectAndAccount(projectId, projectAccountId, 2)
+	data := s.daoSafe.GetStatusByProjectAndAccount(projectId, projectAccountId, 1)
 
-	return nil
+	safeList := make([]viewmodels.Safe, 0)
+	for _, item := range data {
+		safeVM := viewmodels.Safe{}
+
+		Id, _ := comm.AesEncrypt(strconv.Itoa(item.Id), conf.SignSecret)
+		BidsectionId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
+		// AuditId, _ := comm.AesEncrypt(item.AuditId, conf.SignSecret)
+		Uid, _ := comm.AesEncrypt(strconv.Itoa(item.Uid), conf.SignSecret)
+		// ProjectId, _ := comm.AesEncrypt(strconv.Itoa(item.ProjectId), conf.SignSecret)
+
+		safeVM.Id = Id
+		safeVM.BidsectionId = BidsectionId
+		safeVM.Uid = Uid
+		safeVM.Code = item.Code
+		safeVM.CreateTime = item.CreateTime.Format(conf.SysTimeform)
+		safeVM.EndTime = item.EndTime.Format(conf.SysTimeform)
+		safeVM.Position = item.Position
+		safeVM.Inspection = item.Inspection
+		safeVM.InspectionDetail = item.InspectionDetail
+		safeVM.Demand = item.Demand
+		safeVM.Status = item.Status
+		safeList = append(safeList, safeVM)
+	}
+
+	return safeList
 }
 
 // 规则校验

web/api/dashboard_api.go

@@ -43,10 +43,15 @@ func (c *DashboardApi) Get() {
 	}
 
 	safeData := c.ServiceSafe.GetPending(projectId, projectAccountId)
+	qualityData := c.ServiceQuality.GetPending(projectId, projectAccountId)
 
+	data := map[string]interface{}{
+		"safeDataHandle":    safeData,
+		"qualityDataHandle": qualityData,
+	}
 	c.Ctx.JSON(iris.Map{
-		"code":     0,
-		"msg":      "",
-		"safeData": safeData,
+		"code": 0,
+		"msg":  "",
+		"data": data,
 	})
 }