Merge branch 'master' of http://192.168.1.41:3000/caipin/construction_management

services/contract_paid_service.go

@@ -222,7 +222,7 @@ func (s *contractService) makeContractPaidVM(data *models.CmContractsPaid) *view
 	viewContractsReturn.Remarks = data.Remarks
 	viewContractsReturn.CreateTime = data.CreateTime.Format(conf.SysTimeform)
 
-	counts, _ := s.annexDao.GetCount(1, data.Id)
+	counts, _ := s.annexDao.GetCount(5, data.Id)
 	viewContractsReturn.FileCounts = counts
 
 	return viewContractsReturn

services/quality_service.go

@@ -157,7 +157,7 @@ func (s *qualityService) GetDetail(id int, pid int) viewmodels.QualityDetail {
 	data.RectifiedInfo = rectifiedInfo
 
 	// 最新审批人信息
-	latestAuditor := s.daoApprover.GetLastedAuditor(qualityData.BidsectionId, 1, qualityData.Id)
+	latestAuditor := s.daoApprover.GetLastedAuditor(qualityData.BidsectionId, 2, qualityData.Id)
 	data.LatestdAuditor = latestAuditor
 	data.Auditors = encryptAuditors