diff --git a/src/main/java/au/com/royalpay/payment/manage/task/WeekReportGenerationTask.java b/src/main/java/au/com/royalpay/payment/manage/task/WeekReportGenerationTask.java new file mode 100644 index 000000000..4964aa5d2 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/task/WeekReportGenerationTask.java @@ -0,0 +1,31 @@ +package au.com.royalpay.payment.manage.task; + +import au.com.royalpay.payment.manage.analysis.core.WeekReporter; + +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Date; + +import javax.annotation.Resource; + +/** + * Created by wangning on 24/01/2018. + */ +@Component +@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true") +public class WeekReportGenerationTask { + + @Resource + private WeekReporter weekReporter; + + @Scheduled(cron = "0 0 2 * * 1") + public void autoGenerateReport() { + Date lastweek = new Date(); + lastweek = DateUtils.addDays(lastweek, -7); + weekReporter.generateReport(DateFormatUtils.format(lastweek, "yyyy-MM-dd"), true); + } +} diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html index 77151318c..2f49bdeed 100644 --- a/src/main/resources/templates/reports/week_report.html +++ b/src/main/resources/templates/reports/week_report.html @@ -185,11 +185,11 @@
- +
diff --git a/src/main/resources/templates/reports/week_report_partners.html b/src/main/resources/templates/reports/week_report_partners.html index bf801747b..bbf5e4415 100644 --- a/src/main/resources/templates/reports/week_report_partners.html +++ b/src/main/resources/templates/reports/week_report_partners.html @@ -36,8 +36,8 @@
较上周比较
- - + +