Merge pull request '完善了缺陷采集模块接口' (#64) from fix_DEfect into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/64
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

services/qm/implments/ArtView.service.impl.go

@@ -312,6 +312,8 @@ func (impl *ArtViewServiceImplement) Update(user *models.Usertab, entities *[]mo
 			return grmi.NewBusinessError("不存在指定视图!")
 		}
 		entity.Pos = index + 1
+		entity.Descr = view.Descr
+		entity.ViewPicture = view.Picture
 	}
 	artViewDAO := dal.NewArtViewDAO(session, user.Pid, user.Userid)
 	err = artViewDAO.DeleteWhere([]grmi.Predicate{meta.ArtView_ArtId.NewPredicate(grmi.Equal, artId)})

services/qm/implments/DefectGrp.service.impl.go

@@ -174,6 +174,22 @@ func (impl *DefectGrpServiceImplement) SelectOne(user *models.Usertab, defectGrp
 	if err != nil {
 		return nil, err
 	}
+	// 获取缺陷分组关联
+	defectGrpReasonLstDAO := dal.NewDefectGrpReasonLstDAO(session, user.Pid, user.Userid)
+	groupReasons, err := defectGrpReasonLstDAO.Select([]grmi.Predicate{meta.DefectGrpReasonLst_DefectGrpId.NewPredicate(grmi.Equal, defectGrpId)}, nil)
+	if err != nil {
+		return nil, err
+	}
+	reasonIds := make([]interface{}, 0, len(groupReasons))
+	for _, groupReason := range groupReasons {
+		reasonIds = append(reasonIds, groupReason.DefectReasonId)
+	}
+	defectReasonDAO := dal.NewDefectReasonDAO(session, user.Pid, user.Userid)
+	reasons, err := defectReasonDAO.Select([]grmi.Predicate{meta.DefectReason_DefectReasonId.NewPredicate(grmi.Include, reasonIds...)}, nil)
+	if err != nil {
+		return nil, err
+	}
+	result.Reasons = reasons
 	return result, nil
 }
 

services/qm/implments/View.service.impl.go

@@ -196,6 +196,27 @@ func (impl *ViewServiceImplement) SelectOne(user *models.Usertab, viewId string)
 	if err != nil {
 		return nil, err
 	}
+	viewValstDAO := dal.NewViewValstDAO(session, user.Pid, user.Userid)
+	areas, err := viewValstDAO.Select([]grmi.Predicate{meta.ViewValst_ViewId.NewPredicate(grmi.Equal, viewId)}, nil)
+	if err != nil {
+		return nil, err
+	}
+	result.Areas = areas
+	viewDefectGrplstDAO := dal.NewViewDefectGrplstDAO(session, user.Pid, user.Userid)
+	viewGroups, err := viewDefectGrplstDAO.Select([]grmi.Predicate{meta.ViewDefectGrplst_ViewId.NewPredicate(grmi.Equal, viewId)}, nil)
+	if err != nil {
+		return nil, err
+	}
+	groupIds := make([]interface{}, 0, len(viewGroups))
+	for _, viewGroup := range viewGroups {
+		groupIds = append(groupIds, viewGroup.DefectGrpId)
+	}
+	defectGrpDAO := dal.NewDefectGrpDAO(session, user.Pid, user.Userid)
+	groups, err := defectGrpDAO.Select([]grmi.Predicate{meta.DefectGrp_DefectGrpId.NewPredicate(grmi.Include, groupIds...)}, nil)
+	if err != nil {
+		return nil, err
+	}
+	result.Groups = groups
 	return result, nil
 }