Merge branch 'feat-hjj-ReportsManage' into dev

internel/dao/members.go

@@ -74,6 +74,7 @@ func (membersDao) EditMember(req *members.EditMemberReq) (err error) {
 	return
 }
 
+// 删除成员及其相关记录
 func (membersDao) DeleteMember(req *members.DeleteMemberReq) (err error) {
 	return db.DocDB.Transaction(func(tx *gorm.DB) error {
 		// 检查所有相关记录的状态
@@ -135,6 +136,7 @@ func deleteAllRecords(tx *gorm.DB, uuid string) error {
 	return nil
 }
 
+// 获取成员列表
 func (membersDao) GetMemberList(req *members.GetMemberListReq) (data []model.Members, total int64, err error) {
 	dbQuery := db.DocDB.Model(&model.Members{})
 	if req.Filtrate != nil {

internel/logic/annualReports.go

@@ -33,7 +33,7 @@ func (annualReportsLogic) Add(req *reports.AddAnnualReportReq) (result *reports.
 	result = &reports.AddAnnualReportResp{}
 	err = dao.AnnualReportsDao.Add(req)
 	if err != nil {
-		return nil, errors.New("新增年度报告失败")
+		return nil, err
 	}
 	result.Msg = "新增年度报告成功"
 	return result, nil
@@ -43,7 +43,7 @@ func (annualReportsLogic) Edit(req *reports.EditAnnualReportReq) (result *report
 	result = &reports.EditAnnualReportResp{}
 	err = dao.AnnualReportsDao.Edit(req)
 	if err != nil {
-		return nil, errors.New("编辑年度报告失败")
+		return nil, err
 	}
 	result.Msg = "编辑年度报告成功"
 	return result, nil
@@ -53,7 +53,7 @@ func (annualReportsLogic) Delete(req *reports.DeleteAnnualReportReq) (result *re
 	result = &reports.DeleteAnnualReportResp{}
 	err = dao.AnnualReportsDao.Delete(req)
 	if err != nil {
-		return nil, errors.New("删除年度报告失败")
+		return nil, err
 	}
 	result.Msg = "删除年度报告成功"
 	return result, nil

internel/logic/members.go

@@ -22,7 +22,7 @@ func (membersLogic) AddMember(req *members.AddMemberReq) (result *members.AddMem
 	}
 	err = dao.MembersDao.AddMember(req)
 	if err != nil {
-		return nil, errors.New("新增成员失败")
+		return nil, err
 	}
 	result.Msg = "新增成员成功"
 	return nil, nil
@@ -32,7 +32,7 @@ func (membersLogic) EditMember(req *members.EditMemberReq) (result *members.Edit
 	result = &members.EditMemberResp{}
 	err = dao.MembersDao.EditMember(req)
 	if err != nil {
-		return nil, errors.New("编辑成员失败")
+		return nil, err
 	}
 	result.Msg = "编辑成员成功"
 	return nil, nil
@@ -42,7 +42,7 @@ func (membersLogic) DeleteMember(req *members.DeleteMemberReq) (result *members.
 	result = &members.DeleteMemberResp{}
 	err = dao.MembersDao.DeleteMember(req)
 	if err != nil {
-		return nil, errors.New("删除成员失败")
+		return nil, err
 	}
 	result.Msg = "删除成员成功"
 	return nil, nil
@@ -139,7 +139,7 @@ func (membersLogic) EditManagement(req *members.EditManagementReq) (result *memb
 	result = &members.EditManagementResp{}
 	err = dao.MembersDao.EditManagement(req)
 	if err != nil {
-		return nil, errors.New("编辑成员管理失败")
+		return nil, err
 	}
 	result.Msg = "编辑成员管理成功"
 	return result, nil
@@ -150,7 +150,7 @@ func (membersLogic) EditBoardOfDirectors(req *members.EditBoardOfDirectorsReq) (
 	result = &members.EditBoardOfDirectorsResp{}
 	err = dao.MembersDao.EditBoardOfDirectors(req)
 	if err != nil {
-		return nil, errors.New("编辑董事会失败")
+		return nil, err
 	}
 	result.Msg = "编辑董事会成功"
 	return result, nil
@@ -161,7 +161,7 @@ func (membersLogic) EditCommitteeAppointments(req *members.EditCommitteeAppointm
 	result = &members.EditCommitteeAppointmentsResp{}
 	err = dao.MembersDao.EditCommitteeAppointments(req)
 	if err != nil {
-		return nil, errors.New("编辑委员会失败")
+		return nil, err
 	}
 	result.Msg = "编辑委员会成功"
 	return result, nil

internel/logic/quarterlyReports.go

@@ -35,7 +35,7 @@ func (quarterlyReportsLogic) Add(req *reports.AddQuarterlyReportReq) (result *re
 	result = &reports.AddQuarterlyReportResp{}
 	err = dao.QuarterlyReportsDao.Add(req)
 	if err != nil {
-		return nil, errors.New("新增季度报告失败")
+		return nil, err
 	}
 	result.Msg = "新增季度报告成功"
 	return result, nil
@@ -46,7 +46,7 @@ func (quarterlyReportsLogic) Edit(req *reports.EditQuarterlyReportReq) (result *
 	result = &reports.EditQuarterlyReportResp{}
 	err = dao.QuarterlyReportsDao.Edit(req)
 	if err != nil {
-		return nil, errors.New("编辑季度报告失败")
+		return nil, err
 	}
 	result.Msg = "编辑季度报告成功"
 	return result, nil
@@ -57,7 +57,7 @@ func (quarterlyReportsLogic) Delete(req *reports.DeleteQuarterlyReportReq) (resu
 	result = &reports.DeleteQuarterlyReportResp{}
 	err = dao.QuarterlyReportsDao.Delete(req)
 	if err != nil {
-		return nil, errors.New("删除季度报告失败")
+		return nil, err
 	}
 	result.Msg = "删除季度报告成功"
 	return result, nil