Merge branch 'develop' into feature/home

opms_parent/app/handler/sysreport/sys_role_report.go

@@ -27,14 +27,16 @@ func (c *SysRoleReportHandler) GetList(ctx context.Context, req *sys_report.SysR
 }
 
 // Swagger:RoleReport 添加数据
-func (c *SysRoleReportHandler) Add(ctx context.Context, req *sys_report.SysRoleReport, rsp *comm_def.CommonMsg) error {
-	g.Log().Infof("SysReportHandler.Add request %#v ", *req)
+func (c *SysRoleReportHandler) Add(ctx context.Context, req *sys_report.SysRoleReportListAdd, rsp *comm_def.CommonMsg) error {
+	g.Log().Infof("SysReportHandler.Add request %#v ", req)
 	s, err := service.NewSysRoleReportService(ctx)
 	if err != nil {
 		return err
 	}
-	id, err := s.Add(ctx, req)
-	rsp.Data = g.Map{"list": id}
+	err = s.Add(ctx, req)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -78,3 +80,18 @@ func (c *SysRoleReportHandler) Get(ctx context.Context, req *model.IdRequiredReq
 	rsp.Data = ent
 	return nil
 }
+
+// Swagger:RoleReport 获取列表数据
+func (c *SysRoleReportHandler) RoleList(ctx context.Context, req *sys_report.SysRoleReportListReq, rsp *comm_def.CommonMsg) error {
+	g.Log().Infof("SysReportHandler.RoleList request %#v ", *req)
+	s, err := service.NewSysRoleReportService(ctx)
+	if err != nil {
+		return err
+	}
+	ent, err := s.RoleList(ctx, req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": ent}
+	return nil
+}

opms_parent/app/model/sys_report/sys_role_report.go

@@ -31,3 +31,10 @@ type SysRoleReportListReq struct {
 	RoleName    string      `json:"roleName"`     // 角色名称
 	ReportName  string      `json:"reportName"`   // 报表名称
 }
+type SysRoleReportListAdd struct {
+	RoleList []List `   json:"roleList"`
+	ReportId int    `   json:"reportId"` // 报表ID
+}
+type List struct {
+	Id int `     json:"id"` // ID
+}

opms_parent/app/service/sys_report/sys_report.go

@@ -67,9 +67,11 @@ func (s SysReportService) List(ctx context.Context, req *sys_report.SysReportLis
 	if err != nil && err != sql.ErrNoRows {
 		return 0, nil, err
 	}
-	if len(ents) > 0 {
-		
-	}
+	//res := []*model.SysRoleReport{}
+	//dao.DB.Model("").Scan(&res)
+	//if len(ents) > 0 {
+	//
+	//}
 
 	return total, ents, err
 }

opms_parent/app/service/sys_report/sys_role_report.go

@@ -64,21 +64,33 @@ func (s SysRoleReportService) List(ctx context.Context, req *sys_report.SysRoleR
 	}
 	return total, ents, err
 }
-func (s SysRoleReportService) Add(ctx context.Context, req *sys_report.SysRoleReport) (int, error) {
+func (s SysRoleReportService) Add(ctx context.Context, req *sys_report.SysRoleReportListAdd) error {
 
 	validErr := gvalid.CheckStruct(ctx, req, nil)
 	if validErr != nil {
-		return 0, myerrors.TipsError(validErr.Current().Error())
+		return myerrors.TipsError(validErr.Current().Error())
 	}
-	req.CreatedBy = s.userInfo.Id
-	req.CreatedName = s.userInfo.UserName
-	req.CreatedTime = gtime.Now()
-	res, err := s.Dao.Insert(req)
-	if err != nil {
-		return 0, err
+
+	var datas []sys_report.SysRoleReport
+	s.Dao.Where("report_id=?", req.ReportId).
+		Data(g.Map{"updated_by": s.userInfo.Id, "updated_name": s.userInfo.UserName, "updated_time": gtime.Now(), "deleted_time": gtime.Now()}).Update()
+	for _, val := range req.RoleList {
+		var data sys_report.SysRoleReport
+		data.ReportId = req.ReportId
+		data.RoleId = val.Id
+		//data.Remark = val.Remark
+		data.CreatedBy = s.userInfo.Id
+		data.CreatedName = s.userInfo.UserName
+		data.CreatedTime = gtime.Now()
+		datas = append(datas, data)
 	}
-	id, err := res.LastInsertId()
-	return gconv.Int(id), err
+	if len(datas) != 0 {
+		_, err := s.Dao.DB.Model("sys_role_report").Insert(datas)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
 func (s SysRoleReportService) Update(ctx context.Context, req *sys_report.SysRoleReport) (int, error) {
 
@@ -116,3 +128,14 @@ func (s SysRoleReportService) Get(ctx context.Context, id int) (entity *model.Sy
 	}
 	return entity, err
 }
+
+func (s SysRoleReportService) RoleList(ctx context.Context, req *sys_report.SysRoleReportListReq) ([]model.SysRoleReportListReq, error) {
+
+	dao := s.Dao.Unscoped().As("a").Where("a.report_id=? and a.deleted_time is null", req.ReportId)
+	ents := []model.SysRoleReportListReq{}
+	err := dao.Scan(&ents)
+	if err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return ents, err
+}