1

dao/approver_dao.go

@@ -1061,3 +1061,15 @@ func (d *ApproverDao) GetStatusByProjectAndAccount(projectId int, projectAccount
 		Find(&datalist)
 	return datalist
 }
+
+func (d *ApproverDao) GetDataIdByProgress(dataId int, dataType int, progress int) *models.CmApprover {
+	data := &models.CmApprover{}
+	_, err := d.engine.
+		Where(" data_id=? and  data_type=? and progress=? ", dataId, dataType, progress).
+		Get(data)
+	if err != nil {
+		data.Id = 0
+		return data
+	}
+	return data
+}

dao/quality_dao.go

@@ -168,10 +168,11 @@ func (d *QualityDao) GetTypeYear(bidsectionId int, year int) []viewmodels.Qualit
 		// 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`").
+		// , s.`update_time` , pa.`name` as `audit_name`
+		Select("cs.id , cs.`create_time`, cs.`inspection_detail`, cs.status").
 		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").
+		// 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

@@ -163,10 +163,11 @@ func (d *SafeDao) GetTypeYear(bidsectionId int, year int) []viewmodels.SafeSurve
 
 	datalist := make([]viewmodels.SafeSurveyList, 0)
 	_ = 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`").
+		// s.`update_time`, , pa.`name` as `audit_name`
+		Select("cs.id ,  cs.`create_time`, cs.`inspection_detail`, cs.status").
 		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").
+		// 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").

services/quality_service.go

@@ -229,8 +229,13 @@ func (s *qualityService) GetSurvey(projectId int, bidsectionId int) map[string]i
 	}
 	for _, item := range qualityList {
 		if item.Status == 2 {
+
+			idInt, _ := strconv.Atoi(item.Id)
+			detail := s.daoApprover.GetDataIdByProgress(idInt, 2, 1)
+
 			id, _ := comm.AesEncrypt(item.Id, conf.SignSecret)
 			item.Id = id
+			item.UpdateTime = detail.UpdateTime
 			rectifylist = append(rectifylist, item)
 			rectifyTotal++
 		}

services/safe_service.go

@@ -247,8 +247,13 @@ func (s *safeService) GetSurvey(projectId int, bidsectionId int) map[string]inte
 
 	for _, item := range safeList {
 		if item.Status == 2 {
+			// 单独去查审批表 -TODO
+			idInt, _ := strconv.Atoi(item.Id)
+			detail := s.daoApprover.GetDataIdByProgress(idInt, 1, 1)
+
 			id, _ := comm.AesEncrypt(item.Id, conf.SignSecret)
 			item.Id = id
+			item.UpdateTime = detail.UpdateTime
 			rectifylist = append(rectifylist, item)
 			rectifyTotal++
 		}

web/middleware/accessAuth.go

@@ -83,6 +83,7 @@ func AccessAuth(ctx iris.Context) {
 	permissionAccountDao := dao.NewPermissionAccountDao(datasource.InstanceDbMaster())
 	permissionData := permissionAccountDao.GetBidsectionIdAccountId(bidsectionId, account.Id)
 	// permissionData := s.permissionAccountDao.GetBidsectionId(bidsectionId)
+	// fmt.Println("=======================bidsectionId, account.Id")
 	// fmt.Println(bidsectionId, account.Id)
 	// fmt.Println(permissionData)