1

dao/bidsection_dao.go

@@ -30,8 +30,8 @@ func NewBidsectionDao(engine *xorm.Engine) *BidsectionDao {
 func (d *BidsectionDao) Get(id int, projectId int) *models.CmBidsection {
 	data := &models.CmBidsection{Id: id, ProjectId: projectId}
 	//Get取到值后，会自动赋值到data中
-	ok, err := d.engine.Get(data)
-	if ok && err == nil {
+	_, err := d.engine.Get(data)
+	if err == nil {
 		return data
 	} else {
 		data.Id = 0

dao/quality_dao.go

@@ -34,7 +34,7 @@ func (d *QualityDao) GetInIdJoinAccount(ids string) []viewmodels.QualityList {
 	datalist := make([]viewmodels.QualityList, 0)
 	err := d.engine.
 		Table("`cm_quality` as cs").
-		Select("cs.id, cs.`create_time`, cs.`inspection_detail`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`").
+		Select("cs.id, cs.`create_time`, cs.`inspection_detail`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`,cs.`bidsection_id`").
 		Where("cs.id in ( "+ids+" ) ").
 		Join("left", "cm_project_account as pa", "pa.id = cs.uid").
 		Desc("id").

dao/safe_dao.go

@@ -34,7 +34,7 @@ func (d *SafeDao) GetInIdJoinAccount(ids string) []viewmodels.SafeList {
 	datalist := make([]viewmodels.SafeList, 0)
 	err := d.engine.
 		Table("`cm_safe` as cs").
-		Select("cs.id, cs.`create_time`, cs.`inspection_detail`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`").
+		Select("cs.id, cs.`create_time`, cs.`inspection_detail`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`,cs.`bidsection_id`").
 		Where("cs.id in ( "+ids+" ) ").
 		Join("left", "cm_project_account as pa", "pa.id = cs.uid").
 		Desc("id").

services/safe_service.go

@@ -38,6 +38,7 @@ type safeService struct {
 	daoRule           *dao.RuleDao
 	daoApprover       *dao.ApproverDao
 	daoTree           *dao.TreeDao
+	daoBidsection     *dao.BidsectionDao
 	validDetail       string
 }
 
@@ -52,6 +53,7 @@ func NewSafeService() SafeService {
 		daoProjectAccount: dao.NewProjectAccountDao(datasource.InstanceDbMaster()),
 		daoApprover:       dao.NewApproverDao(datasource.InstanceDbMaster()),
 		daoTree:           dao.NewTreeDao(datasource.InstanceDbMaster()),
+		daoBidsection:     dao.NewBidsectionDao(datasource.InstanceDbMaster()),
 	}
 }
 func (s *safeService) Get(id int, pid int, pageNo int, pageSize int) ([]viewmodels.SafeList, int64) {
@@ -380,23 +382,28 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 		if item.DataType == 1 {
 			for _, data := range safeList {
 				if dataIdString == data.Id {
+					bidSectionDetail := s.daoBidsection.Get(data.BidsectionId, projectId)
 					approverVM.Code = data.Code
 					approverVM.InspectionDetail = data.InspectionDetail
 					approverVM.Name = data.AuditName
 					approverVM.Position = data.Position
 					approverVM.Inspection = data.Inspection
+					approverVM.BidsectionName = bidSectionDetail.Name
 					approverVM.CreateTime = data.CreateTime
+
 					break
 				}
 			}
 		} else if item.DataType == 2 { // 质量巡检
 			for _, data := range qualityList {
 				if dataIdString == data.Id {
+					bidSectionDetail := s.daoBidsection.Get(projectId, data.BidsectionId)
 					approverVM.Code = data.Code
 					approverVM.InspectionDetail = data.InspectionDetail
 					approverVM.Name = data.AuditName
 					approverVM.Position = data.Position
 					approverVM.Inspection = data.Inspection
+					approverVM.BidsectionName = bidSectionDetail.Name
 					approverVM.CreateTime = data.CreateTime
 					break
 				}

web/viewmodels/approver.go

@@ -34,6 +34,7 @@ type ApproverMessage struct {
 	Code             string `from:"code" json:"code"`
 	Inspection       string `from:"inspection" json:"inspection"`
 	InspectionDetail string `from:"inspectionDetail" json:"inspectionDetail"`
+	BidsectionName   string `from:"bidsectionName" json:"bidsectionName"`
 	Name             string `from:"name" json:"name"`
 	Position         string `from:"position" json:"position"`
 	CreateTime       string `form:"createTime" json:"createTime"`

web/viewmodels/quality.go

@@ -35,6 +35,7 @@ type QualityList struct {
 	Position         string `form:"position" json:"position"`
 	Inspection       string `form:"inspection" json:"inspection"`
 	InspectionDetail string `form:"inspectionDetail" json:"inspectionDetail"`
+	BidsectionId     int    `form:"bidsectionId" json:"bidsectionId"`
 	Demand           string `form:"demand" json:"demand"`
 	Status           int    `form:"status" json:"status"`
 	AuditName        string `form:"auditName" json:"auditName"`

web/viewmodels/safe.go

@@ -35,6 +35,7 @@ type SafeList struct {
 	Position         string `form:"position" json:"position"`
 	Inspection       string `form:"inspection" json:"inspection"`
 	InspectionDetail string `form:"inspectionDetail" json:"inspectionDetail"`
+	BidsectionId     int    `form:"bidsectionId" json:"bidsectionId"`
 	Demand           string `form:"demand" json:"demand"`
 	Status           int    `form:"status" json:"status"`
 	AuditName        string `form:"auditName" json:"auditName"`