|
|
|
@@ -90,8 +90,6 @@ type ProjectSummaryData struct { |
|
|
|
|
|
|
|
type ProjectSummaryPeriodData struct { |
|
|
|
RecordBeginTime string `json:"recordBeginTime"` |
|
|
|
PageSize int `json:"pageSize"` |
|
|
|
TotalPage int `json:"totalPage"` |
|
|
|
TotalCount int64 `json:"totalCount"` |
|
|
|
PageRecords []*ProjectSummaryBaseData `json:"pageRecords"` |
|
|
|
} |
|
|
|
@@ -152,20 +150,12 @@ func GetProjectsSummaryData(ctx *context.Context) { |
|
|
|
|
|
|
|
queryType := ctx.QueryTrim("type") |
|
|
|
|
|
|
|
page := ctx.QueryInt("page") |
|
|
|
if page <= 0 { |
|
|
|
page = 1 |
|
|
|
} |
|
|
|
pageSize := ctx.QueryInt("pagesize") |
|
|
|
if pageSize <= 0 { |
|
|
|
pageSize = DEFAULT_PAGE_SIZE |
|
|
|
} |
|
|
|
var count int64 |
|
|
|
|
|
|
|
if queryType == "all" || queryType == "current_year" { |
|
|
|
dates := getEndOfMonthDates(beginTime, endTime) |
|
|
|
count, _ = models.GetSummaryStatisticByDateCount(dates) |
|
|
|
stats, err := models.GetSummaryStatisticByDates(dates, page, pageSize) |
|
|
|
stats, err := models.GetAllSummaryStatisticByDates(dates) |
|
|
|
if err != nil { |
|
|
|
log.Warn("can not get summary data", err) |
|
|
|
} else { |
|
|
|
@@ -184,7 +174,7 @@ func GetProjectsSummaryData(ctx *context.Context) { |
|
|
|
|
|
|
|
} else { |
|
|
|
count, _ = models.GetSummaryStatisticByTimeCount(beginTime, endTime) |
|
|
|
stats, err := models.GetSummaryStatisticByTime(beginTime, endTime, page, pageSize) |
|
|
|
stats, err := models.GetAllSummaryStatisticByTime(beginTime, endTime) |
|
|
|
if err != nil { |
|
|
|
log.Warn("can not get summary data", err) |
|
|
|
} else { |
|
|
|
@@ -203,9 +193,7 @@ func GetProjectsSummaryData(ctx *context.Context) { |
|
|
|
} |
|
|
|
projectSummaryPeriodData := ProjectSummaryPeriodData{ |
|
|
|
TotalCount: count - 1, |
|
|
|
TotalPage: getTotalPage(count-1, pageSize), |
|
|
|
RecordBeginTime: recordBeginTime.Format(DATE_FORMAT), |
|
|
|
PageSize: pageSize, |
|
|
|
PageRecords: datas, |
|
|
|
} |
|
|
|
|
|
|
|
|