liuzhihang/micro-document
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: liuzhihang:69bf220bfa79cfb7a933fec2ba0dacc28ad63caf
Branches Tags
liuzhihang:main
liuzhihang:dev
liuzhihang:sxy1023
liuzhihang:feat-hjj-ReportsManage
liuzhihang:sxy
liuzhihang:dev-lzh
..
compare: liuzhihang:a145e6c1e63854cfbb67c93ede6018ebd20cccd8
Branches Tags
liuzhihang:dev
liuzhihang:main
liuzhihang:sxy1023
liuzhihang:feat-hjj-ReportsManage
liuzhihang:sxy
liuzhihang:dev-lzh

No commits in common. "69bf220bfa79cfb7a933fec2ba0dacc28ad63caf" and "a145e6c1e63854cfbb67c93ede6018ebd20cccd8" have entirely different histories.
69bf220bfa ... a145e6c1e6

3 changed files with 4 additions and 64 deletions
Show Stats Expand all files Collapse all files

18
internel/dao/annualReports.go
View File

@ -34,15 +34,6 @@ func (annualReportsDao) List(req *reports.GetAnnualReportListReq) (data []model.
}
func (annualReportsDao) Add(req *reports.AddAnnualReportReq) (err error) {
if req.FileName == "" {
return errors.New("文件名称不能为空")
}
if req.Date == 0 {
return errors.New("日期不能为空")
}
if req.FileUrl == "" {
return errors.New("文件地址不能为空")
}
err = db.DocDB.Model(&model.AnnualReport{}).Create(&model.AnnualReport{
FileName: req.FileName,
Date: req.Date,
@ -57,15 +48,6 @@ func (annualReportsDao) Add(req *reports.AddAnnualReportReq) (err error) {
}
func (annualReportsDao) Edit(req *reports.EditAnnualReportReq) (err error) {
if req.FileName == "" {
return errors.New("文件名称不能为空")
}
if req.Date == 0 {
return errors.New("日期不能为空")
}
if req.FileUrl == "" {
return errors.New("文件地址不能为空")
}
err = db.DocDB.Model(&model.AnnualReport{}).Where("id = ?", req.Id).UpdateColumns(&model.AnnualReport{
FileName: req.FileName,
Date: req.Date,

38
internel/dao/members.go
View File

@ -15,9 +15,6 @@ type membersDao struct{}
var MembersDao = new(membersDao)
func (membersDao) AddMember(req *members.AddMemberReq) (err error) {
if req.Name == "" {
return errors.New("姓名不能为空")
}
err = db.DocDB.Model(&model.Members{}).Create(&model.Members{
Uuid: req.Uuid,
Name: req.Name,
@ -59,10 +56,7 @@ func (membersDao) AddMember(req *members.AddMemberReq) (err error) {
}
func (membersDao) EditMember(req *members.EditMemberReq) (err error) {
if req.Name == "" {
return errors.New("姓名不能为空")
}
err = db.DocDB.Model(&model.Members{}).Where("uuid = ?", req.Uuid).Select("name", "brief", "introduction", "sort", "operator", "operator_id").Updates(&model.Members{
err = db.DocDB.Model(&model.Members{}).Where("uuid = ?", req.Uuid).Updates(&model.Members{
Name: req.Name,
Brief: req.Brief,
Introduction: req.Introduction,
@ -183,13 +177,7 @@ func (membersDao) GetCommitteeAppointmentsByUuid(uuid string) (committeeAppointm
// 编辑成员管理
func (membersDao) EditManagement(req *members.EditManagementReq) (err error) {
if req.Status == 0 {
return errors.New("状态不能为空")
}
if req.Introduction == "" {
return errors.New("详细介绍不能为空")
}
err = db.DocDB.Model(&model.Management{}).Where("uuid = ?", req.Uuid).Select("name", "image", "status", "brief", "introduction", "is_setting").Updates(&model.Management{
err = db.DocDB.Model(&model.Management{}).Where("uuid = ?", req.Uuid).Updates(&model.Management{
Name: req.Name,
Image: req.Image,
Status: req.Status,
@ -214,13 +202,7 @@ func (membersDao) EditManagement(req *members.EditManagementReq) (err error) {
// 编辑董事会
func (membersDao) EditBoardOfDirectors(req *members.EditBoardOfDirectorsReq) (err error) {
if req.Status == 0 {
return errors.New("状态不能为空")
}
if req.Introduction == "" {
return errors.New("详细介绍不能为空")
}
err = db.DocDB.Model(&model.BoardOfDirectors{}).Where("uuid = ?", req.Uuid).Select("name", "status", "brief", "introduction", "is_setting").Updates(&model.BoardOfDirectors{
err = db.DocDB.Model(&model.BoardOfDirectors{}).Where("uuid = ?", req.Uuid).Updates(&model.BoardOfDirectors{
Name: req.Name,
Status: req.Status,
Brief: req.Brief,
@ -244,18 +226,6 @@ func (membersDao) EditBoardOfDirectors(req *members.EditBoardOfDirectorsReq) (er
// 编辑委员会
func (membersDao) EditCommitteeAppointments(req *members.EditCommitteeAppointmentsReq) (err error) {
if req.AuditCommittee == 0 {
return errors.New("审计委员会不能为空")
}
if req.CompensationCommittee == 0 {
return errors.New("薪酬委员会不能为空")
}
if req.NominatingCommittee == 0 {
return errors.New("提名委员会不能为空")
}
if req.Status == 0 {
return errors.New("状态不能为空")
}
err = db.DocDB.Model(&model.CommitteeAppointments{}).Where("uuid = ?", req.Uuid).Updates(&model.CommitteeAppointments{
Name: req.Name,
Status: req.Status,
@ -279,7 +249,7 @@ func (membersDao) EditCommitteeAppointments(req *members.EditCommitteeAppointmen
return
}
// =============批量查询成员管理，董事会，委员会接口==================
// 批量查询成员管理，董事会，委员会接口
// 批量查询成员管理
func (membersDao) GetManagementByUuids(uuids []string) (map[string]model.Management, error) {
var managementList []model.Management

12
internel/dao/quarterlyReports.go
View File

@ -33,12 +33,6 @@ func (quarterlyReportsDao) List(req *reports.GetQuarterlyReportListReq) (data []
}
func (quarterlyReportsDao) Add(req *reports.AddQuarterlyReportReq) (err error) {
if req.FileName == "" {
return errors.New("文件名称不能为空")
}
if req.Attachment == "" {
return errors.New("附件不能为空")
}
err = db.DocDB.Model(&model.QuarterlyReport{}).Create(&model.QuarterlyReport{
FileName: req.FileName,
FileIntroduce: req.FileIntroduce,
@ -54,12 +48,6 @@ func (quarterlyReportsDao) Add(req *reports.AddQuarterlyReportReq) (err error) {
}
func (quarterlyReportsDao) Edit(req *reports.EditQuarterlyReportReq) (err error) {
if req.FileName == "" {
return errors.New("文件名称不能为空")
}
if req.Attachment == "" {
return errors.New("附件不能为空")
}
err = db.DocDB.Model(&model.QuarterlyReport{}).Where("id = ?", req.Id).UpdateColumns(&model.QuarterlyReport{
FileName: req.FileName,
FileIntroduce: req.FileIntroduce,