合同百分比，去0.安全，质量概况无数据

dao/quality_dao.go

@@ -163,11 +163,15 @@ func (d *QualityDao) GetTypeYear(bidsectionId int, year int) []viewmodels.Qualit
 	endYear := fmt.Sprintf("%d-12-31:23.59.59", year)
 
 	datalist := make([]viewmodels.QualitySurveyList, 0)
-	_ = d.engine.Table("`cm_approver` as cs").
-		Select("cs.data_id as id, cs.`update_time`, s.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
-		Where("cs.bidsection_id = ? and status=1 and progress=1 and data_type=2 and cs.update_time>='"+startYear+"' and cs.update_time<='"+endYear+"' ", bidsectionId).
-		Join("left", "cm_quality as s", "s.id = cs.data_id").
-		Join("left", "cm_project_account as pa", "pa.id = cs.uid").
+	_ = d.engine.Table("`cm_quality` as cs").
+		// Select("cs.data_id as id, cs.`update_time`, s.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
+		// Where("cs.bidsection_id = ? and status=1 and progress=1 and data_type=2 and cs.update_time>='"+startYear+"' and cs.update_time<='"+endYear+"' ", bidsectionId).
+		// Join("left", "cm_quality as s", "s.id = cs.data_id").
+		// Join("left", "cm_project_account as pa", "pa.id = cs.uid").
+		Select("cs.id , s.`update_time`, cs.`create_time`, cs.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
+		Where("cs.bidsection_id = ?  and cs.create_time>='"+startYear+"' and cs.create_time<='"+endYear+"' ", bidsectionId).
+		Join("left", "cm_approver as s", "cs.id = s.data_id and s.data_id=2").
+		Join("left", "cm_project_account as pa", "pa.id = s.audit_id").
 		Desc("id").
 		Find(&datalist)
 	// _ = d.engine.

dao/safe_dao.go

@@ -155,23 +155,46 @@ func (d *SafeDao) GetStatusByProjectAndAccount(projectId int, projectAccountId i
 	return datalist
 }
 
-// 获得某年份下的安全
+// 获得某年份下的审批记录
 func (d *SafeDao) GetTypeYear(bidsectionId int, year int) []viewmodels.SafeSurveyList {
 
 	startYear := fmt.Sprintf("%d-01-01:00.00.00", year)
 	endYear := fmt.Sprintf("%d-12-31:23.59.59", year)
 
 	datalist := make([]viewmodels.SafeSurveyList, 0)
-	_ = d.engine.Table("`cm_approver` as cs").
-		Select("cs.data_id as id, cs.`update_time`, s.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
-		Where("cs.bidsection_id = ? and status=1 and progress=1 and data_type=1 and cs.update_time>='"+startYear+"' and cs.update_time<='"+endYear+"' ", bidsectionId).
-		Join("left", "cm_safe as s", "s.id = cs.data_id").
-		Join("left", "cm_project_account as pa", "pa.id = cs.audit_id").
+	_ = d.engine.Table("`cm_safe` as cs").
+		Select("cs.id , s.`update_time`, cs.`create_time`, cs.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
+		Where("cs.bidsection_id = ?  and cs.create_time>='"+startYear+"' and cs.create_time<='"+endYear+"' ", bidsectionId).
+		Join("left", "cm_approver as s", "cs.id = s.data_id and s.data_id=1").
+		Join("left", "cm_project_account as pa", "pa.id = s.audit_id").
 		Desc("id").
 		Find(&datalist)
+	// _ = d.engine.Table("`cm_approver` as cs").
+	// 	Select("cs.data_id as id, cs.`update_time`, s.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
+	// 	Where("cs.bidsection_id = ? and status=1 and progress=1 and data_type=1 and cs.update_time>='"+startYear+"' and cs.update_time<='"+endYear+"' ", bidsectionId).
+	// 	Join("left", "cm_safe as s", "s.id = cs.data_id").
+	// 	Join("left", "cm_project_account as pa", "pa.id = cs.audit_id").
+	// 	Desc("id").
+	// 	Find(&datalist)
 	return datalist
 }
 
+// // 获得某年份下的安全
+// func (d *SafeDao) GetTypeYear(bidsectionId int, year int) []viewmodels.SafeSurveyList {
+
+// 	startYear := fmt.Sprintf("%d-01-01:00.00.00", year)
+// 	endYear := fmt.Sprintf("%d-12-31:23.59.59", year)
+
+// 	datalist := make([]viewmodels.SafeSurveyList, 0)
+// 	_ = d.engine.Table("`cm_safe` as cs").
+// 		Select("cs.id, cs.`create_time`, cs.`inspection_detail`, cs.status, pa.`name` as `audit_name`").
+// 		Where("cs.bidsection_id = ? and cs.create_time>='"+startYear+"' and cs.create_time<='"+endYear+"' ", bidsectionId).
+// 		Join("left", "cm_project_account as pa", "pa.id = cs.uid").
+// 		Desc("id").
+// 		Find(&datalist)
+// 	return datalist
+// }
+
 // 根据bid
 func (d *SafeDao) GetCountsByBid(bidsectionId int, status int, isAll bool) (int64, error) {
 	data := &models.CmSafe{}

services/quality_service.go

@@ -234,13 +234,15 @@ func (s *qualityService) GetSurvey(projectId int, bidsectionId int) map[string]i
 			rectifylist = append(rectifylist, item)
 			rectifyTotal++
 		}
+		if item.Status == 1 {
+			approvalTotal++
+		}
 
-		approvalTotal++
 		if item.Status == 4 {
 			rectifyedTotal++
 		}
 
-		index := item.UpdateTime.Format(conf.SysTimeformMonth)
+		index := item.CreateTime.Format(conf.SysTimeformMonth)
 		submitData[index] = submitData[index] + 1
 
 		if item.Status == 4 {

services/safe_service.go

@@ -244,6 +244,7 @@ func (s *safeService) GetSurvey(projectId int, bidsectionId int) map[string]inte
 		fmt.Sprintf("%d-11", year): 0,
 		fmt.Sprintf("%d-12", year): 0,
 	}
+
 	for _, item := range safeList {
 		if item.Status == 2 {
 			id, _ := comm.AesEncrypt(item.Id, conf.SignSecret)
@@ -251,10 +252,10 @@ func (s *safeService) GetSurvey(projectId int, bidsectionId int) map[string]inte
 			rectifylist = append(rectifylist, item)
 			rectifyTotal++
 		}
-		// if item.Status == 1 {
-		// 	approvalTotal++
-		// }
-		approvalTotal++
+		if item.Status == 1 {
+			approvalTotal++
+		}
+		// approvalTotal++
 		if item.Status == 4 {
 			rectifyedTotal++
 		}
@@ -272,7 +273,7 @@ func (s *safeService) GetSurvey(projectId int, bidsectionId int) map[string]inte
 		// 		// }
 		// 	}
 		// }
-		index := item.UpdateTime.Format(conf.SysTimeformMonth)
+		index := item.CreateTime.Format(conf.SysTimeformMonth)
 		submitData[index] = submitData[index] + 1
 		// if item.Status == 0 {
 		// 	submitData[item.CreateTime.Format(conf.SysTimeformMonth)] = submitData[item.CreateTime.Format(conf.SysTimeformMonth)] + 1

web/viewmodels/quality.go

@@ -46,6 +46,7 @@ type QualityList struct {
 type QualitySurveyList struct {
 	Id               string    `form:"id" json:"id" `
 	UpdateTime       time.Time `form:"updateTime" json:"updateTime"`
+	CreateTime       time.Time `form:"createTime" json:"createTime"`
 	InspectionDetail string    `form:"inspectionDetail" json:"inspectionDetail"`
 	Status           int       `form:"status" json:"status"`
 	AuditName        string    `form:"auditName" json:"auditName"`

web/viewmodels/safe.go

@@ -46,6 +46,7 @@ type SafeList struct {
 type SafeSurveyList struct {
 	Id               string    `form:"id" json:"id" `
 	UpdateTime       time.Time `form:"updateTime" json:"updateTime"`
+	CreateTime       time.Time `form:"createTime" json:"createTime"`
 	InspectionDetail string    `form:"inspectionDetail" json:"inspectionDetail"`
 	Status           int       `form:"status" json:"status"`
 	AuditName        string    `form:"auditName" json:"auditName"`