Merge branch 'feat-hjj-ReportsManage' into dev

api/reports/reports.proto

@@ -21,8 +21,12 @@ service Reports{
 }
 
 message Filtrate{
-    string fileName = 3;//文件名称
-    int32 status = 4;//状态（1：上架，2：下架）
+    string fileName = 1;//文件名称
+    int32 status = 2;//状态（1：上架，2：下架）
+}
+
+message FiltrateWeb{
+    string fileName = 1;//文件名称
 }
 //==================================年度报告======================================
 message GetAnnualReportListReq{
@@ -87,11 +91,15 @@ message DeleteAnnualReportResp{
 }
 
 message DisplayAnnualReportReq{
-
+    int32 page = 1;
+    int32 pageSize = 2;
 }
 
 message DisplayAnnualReportResp{
-    repeated DisplayAnnualReportItem Item = 1;
+    int32 page=1;
+    int32 pageSize =2;
+    int32 total = 3;
+    repeated DisplayAnnualReportItem Item = 4;
 }
 
 message DisplayAnnualReportItem{
@@ -166,11 +174,16 @@ message DeleteQuarterlyReportResp{
 }
 
 message DisplayQuarterlyReportReq{
-
+    int32 page = 1;
+    int32 pageSize = 2;
+    FiltrateWeb filtrate = 3;
 }
 
 message DisplayQuarterlyReportResp{
-    repeated DisplayQuarterlyReportItem Item = 1;
+    int32 page=1;
+    int32 pageSize =2;
+    int32 total = 3;
+    repeated DisplayQuarterlyReportItem Item = 4;
 }
 
 message DisplayQuarterlyReportItem {

api/reports/reports.validator.pb.go

@@ -18,6 +18,9 @@ var _ = math.Inf
 func (this *Filtrate) Validate() error {
 	return nil
 }
+func (this *FiltrateWeb) Validate() error {
+	return nil
+}
 func (this *GetAnnualReportListReq) Validate() error {
 	if this.Filtrate != nil {
 		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Filtrate); err != nil {
@@ -113,6 +116,11 @@ func (this *DeleteQuarterlyReportResp) Validate() error {
 	return nil
 }
 func (this *DisplayQuarterlyReportReq) Validate() error {
+	if this.Filtrate != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Filtrate); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("Filtrate", err)
+		}
+	}
 	return nil
 }
 func (this *DisplayQuarterlyReportResp) Validate() error {

internel/dao/annualReports.go

@@ -104,10 +104,14 @@ func (annualReportsDao) Delete(req *reports.DeleteAnnualReportReq) (err error) {
 	return
 }
 
-func (annualReportsDao) Display() (data []model.AnnualReport, err error) {
-	err = db.DocDB.Model(&model.AnnualReport{}).Where("status = ?", msg.StatusOnline).Order("sort ASC").Find(&data).Error
+func (annualReportsDao) Display(req *reports.DisplayAnnualReportReq) (data []model.AnnualReport, total int64, err error) {
+	result := db.DocDB.Model(&model.AnnualReport{})
+	result = result.Where("status = ?", msg.StatusOnline).Order("sort ASC")
+	result.Count(&total)
+	err = result.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
+
 	if err != nil {
-		return nil, errors.New("查询年度报告失败")
+		return nil, 0, errors.New("查询年度报告失败")
 	}
-	return
+	return data, total, nil
 }

internel/dao/quarterlyReports.go

@@ -99,10 +99,18 @@ func (quarterlyReportsDao) Delete(req *reports.DeleteQuarterlyReportReq) (err er
 	return
 }
 
-func (quarterlyReportsDao) Display() (data []model.QuarterlyReport, err error) {
-	err = db.DocDB.Model(&model.QuarterlyReport{}).Where("status = ?", msg.StatusOnline).Order("sort ASC").Find(&data).Error
+func (quarterlyReportsDao) Display(req *reports.DisplayQuarterlyReportReq) (data []model.QuarterlyReport, total int64, err error) {
+	result := db.DocDB.Model(&model.QuarterlyReport{})
+	if req.Filtrate != nil {
+		if req.Filtrate.FileName != "" {
+			result = result.Where("file_name LIKE ?", "%"+req.Filtrate.FileName+"%")
+		}
+	}
+	result = result.Where("status = ?", msg.StatusOnline).Order("sort ASC")
+	result.Count(&total)
+	err = result.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
 	if err != nil {
-		return nil, errors.New("查询季度报告失败")
+		return nil, 0, errors.New("查询季度报告失败")
 	}
 	return
 }

internel/logic/annualReports.go

@@ -62,11 +62,15 @@ func (annualReportsLogic) Delete(req *reports.DeleteAnnualReportReq) (result *re
 }
 
 func (annualReportsLogic) Display(req *reports.DisplayAnnualReportReq) (result *reports.DisplayAnnualReportResp, err error) {
-	result = &reports.DisplayAnnualReportResp{}
-	data, err := dao.AnnualReportsDao.Display()
+	result = &reports.DisplayAnnualReportResp{
+		Page:     req.Page,
+		PageSize: req.PageSize,
+	}
+	data, total, err := dao.AnnualReportsDao.Display(req)
 	if err != nil {
 		return nil, err
 	}
+	result.Total = int32(total)
 	result.Item = lo.Map(data, func(m model.AnnualReport, i int) *reports.DisplayAnnualReportItem {
 		return &reports.DisplayAnnualReportItem{
 			FileName: m.FileName,

internel/logic/quarterlyReports.go

@@ -67,11 +67,15 @@ func (quarterlyReportsLogic) Delete(req *reports.DeleteQuarterlyReportReq) (resu
 
 // 季度报告展示列表
 func (quarterlyReportsLogic) Display(req *reports.DisplayQuarterlyReportReq) (result *reports.DisplayQuarterlyReportResp, err error) {
-	result = &reports.DisplayQuarterlyReportResp{}
-	data, err := dao.QuarterlyReportsDao.Display()
+	result = &reports.DisplayQuarterlyReportResp{
+		Page:     req.Page,
+		PageSize: req.PageSize,
+	}
+	data, total, err := dao.QuarterlyReportsDao.Display(req)
 	if err != nil {
 		return nil, err
 	}
+	result.Total = int32(total)
 	result.Item = lo.Map(data, func(m model.QuarterlyReport, i int) *reports.DisplayQuarterlyReportItem {
 		return &reports.DisplayQuarterlyReportItem{
 			FileName:       m.FileName,