正在显示
2 个修改的文件
包含
20 行增加
和
20 行删除
@@ -433,9 +433,8 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut | @@ -433,9 +433,8 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut | ||
433 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 433 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
434 | } else { | 434 | } else { |
435 | if len(listIntervals) == 0 { // 未配置年榜 | 435 | if len(listIntervals) == 0 { // 未配置年榜 |
436 | - timeNow := time.Now().Local() | ||
437 | - contributionsWealthRankingQuery.StartTime = time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.Local) | ||
438 | - contributionsWealthRankingQuery.EndTime = time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 0, time.Local) | 436 | + contributionsWealthRankingQuery.StartTime = time.Date(00001, 01, 01, 0, 0, 0, 0, time.Local) |
437 | + contributionsWealthRankingQuery.EndTime = time.Date(0001, 01, 01, 23, 59, 59, 0, time.Local) | ||
439 | } else if len(listIntervals) == 1 { // 只配置了一个年榜 | 438 | } else if len(listIntervals) == 1 { // 只配置了一个年榜 |
440 | currentTime := time.Now().Local() | 439 | currentTime := time.Now().Local() |
441 | if currentTime.After(listIntervals[0].IntervalStartTime.Local()) && currentTime.Before(listIntervals[0].IntervalEndTime.Local()) || currentTime.Equal(listIntervals[0].IntervalStartTime.Local()) || currentTime.Equal(listIntervals[0].IntervalEndTime.Local()) { // 当前时间在榜单内 | 440 | if currentTime.After(listIntervals[0].IntervalStartTime.Local()) && currentTime.Before(listIntervals[0].IntervalEndTime.Local()) || currentTime.Equal(listIntervals[0].IntervalStartTime.Local()) || currentTime.Equal(listIntervals[0].IntervalEndTime.Local()) { // 当前时间在榜单内 |
@@ -510,6 +510,7 @@ func (controller *SuMoneyController) ImportExchangeList () { | @@ -510,6 +510,7 @@ func (controller *SuMoneyController) ImportExchangeList () { | ||
510 | // 新增成功计数 | 510 | // 新增成功计数 |
511 | var successDataCount int64 | 511 | var successDataCount int64 |
512 | 512 | ||
513 | + // 导入命令 | ||
513 | var createExchangeCashPersonCommands []*command.CreateExchangeCashPersonCommand | 514 | var createExchangeCashPersonCommands []*command.CreateExchangeCashPersonCommand |
514 | 515 | ||
515 | for i, row := range rows { | 516 | for i, row := range rows { |
@@ -534,23 +535,23 @@ func (controller *SuMoneyController) ImportExchangeList () { | @@ -534,23 +535,23 @@ func (controller *SuMoneyController) ImportExchangeList () { | ||
534 | controller.ServeJSON() | 535 | controller.ServeJSON() |
535 | return | 536 | return |
536 | } else { | 537 | } else { |
537 | - successDataCount = int64(len(rows) - 3 - len(failureDataList)) | ||
538 | - } | ||
539 | - | ||
540 | - // 导入失败返回 | ||
541 | - ret = map[string]interface{}{ | ||
542 | - "successCount": successDataCount, | ||
543 | - "fail": map[string]interface{}{ | ||
544 | - "tableHeader": tableHeader, | ||
545 | - "tableData": failureDataList, | ||
546 | - }, | ||
547 | - } | ||
548 | - | ||
549 | - // 导入成功返回 | ||
550 | - if successDataCount == int64(len(rows) - 3) { | ||
551 | - ret = map[string]interface{}{ | ||
552 | - "successCount": successDataCount, | ||
553 | - "fail": nil, | 538 | + if len(failureDataList) > 0 { // 导入失败返回 |
539 | + successDataCount = 0 | ||
540 | + ret = map[string]interface{}{ | ||
541 | + "successCount": successDataCount, | ||
542 | + "fail": map[string]interface{}{ | ||
543 | + "tableHeader": tableHeader, | ||
544 | + "tableData": failureDataList, | ||
545 | + }, | ||
546 | + } | ||
547 | + } else { // 导入成功返回 | ||
548 | + successDataCount = int64(len(rows) - 3 - len(failureDataList)) | ||
549 | + if successDataCount == int64(len(rows) - 3) { | ||
550 | + ret = map[string]interface{}{ | ||
551 | + "successCount": successDataCount, | ||
552 | + "fail": nil, | ||
553 | + } | ||
554 | + } | ||
554 | } | 555 | } |
555 | } | 556 | } |
556 | 557 |
-
请 注册 或 登录 后发表评论