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

dao/approver_dao.go

@@ -508,7 +508,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 					session.Rollback()
 					return err
 				}
-				if lastAuditor.AuditId == auditor.AuditId {
+				if lastAuditor.Id == auditor.Id {
 					// 说明审批流程已经走完
 					_, err = session.Exec("update `cm_safe` set status = ? where id = ?", 4, auditor.DataId)
 					if err != nil {
@@ -629,7 +629,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 					session.Rollback()
 					return err
 				}
-				if lastAuditor.AuditId == auditor.AuditId {
+				if lastAuditor.Id == auditor.Id {
 					// 说明审批流程已经走完
 					_, err = session.Exec("update `cm_quality` set status = ? where id = ?", 4, auditor.DataId)
 					if err != nil {
@@ -706,7 +706,7 @@ func (d *ApproverDao) BackHandlerWithId(auditType string, id int, uid int, times
 			return err
 		}
 		safe.Status = auditor.Progress + 1
-		_, err = session.Update(safe)
+		_, err = session.Where("id = ? and bidsection_id = ?", safe.Id, safe.BidsectionId).Limit(1).Update(safe)
 		if err != nil {
 			session.Rollback()
 			return err
@@ -767,7 +767,7 @@ func (d *ApproverDao) BackHandlerWithId(auditType string, id int, uid int, times
 		}
 
 		quality.Status = auditor.Progress + 1
-		_, err = session.Update(quality)
+		_, err = session.Where("id =? and bidsection_id = ?", quality.Id, quality.BidsectionId).Limit(1).Update(quality)
 		if err != nil {
 			session.Rollback()
 			return err

services/quality_service.go

@@ -64,7 +64,7 @@ func (s *qualityService) Get(id int, pid int, pageNo int, pageSize int) ([]viewm
 		qualityVM.InspectionDetail = item.InspectionDetail
 		qualityVM.Position = item.Position
 		qualityVM.Status = item.Status
-		counts, _ := s.daoAnnex.GetCount(3, item.Id)
+		counts, _ := s.daoAnnex.GetCount(2, item.Id)
 		qualityVM.FileCounts = counts
 		qualityList = append(qualityList, qualityVM)
 	}