From 6d727a4b7aaa9d92e4116e393427f135fa21cb81 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 24 Jan 2018 07:48:04 +0800
Subject: [PATCH 1/3] update
---
src/main/resources/templates/reports/week_report.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html
index 77151318c..f46d9c15d 100644
--- a/src/main/resources/templates/reports/week_report.html
+++ b/src/main/resources/templates/reports/week_report.html
@@ -186,10 +186,10 @@
From 95e23309261bce90981b3861e62e525093c318aa Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 24 Jan 2018 22:23:52 +1100
Subject: [PATCH 2/3] fixbug weekReport
---
.../manage/task/WeekReportGenerationTask.java | 31 +++++++++++++++++++
.../templates/reports/week_report.html | 8 ++---
2 files changed, 35 insertions(+), 4 deletions(-)
create mode 100644 src/main/java/au/com/royalpay/payment/manage/task/WeekReportGenerationTask.java
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 f46d9c15d..138826f51 100644
--- a/src/main/resources/templates/reports/week_report.html
+++ b/src/main/resources/templates/reports/week_report.html
@@ -185,11 +185,11 @@
-
+
From ed75226b061cd5d21dbd64e5e76db4e9d84297cb Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 29 Jan 2018 09:47:16 +0800
Subject: [PATCH 3/3] fixbug
---
src/main/resources/templates/reports/week_report.html | 4 ++--
.../resources/templates/reports/week_report_partners.html | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html
index 138826f51..2f49bdeed 100644
--- a/src/main/resources/templates/reports/week_report.html
+++ b/src/main/resources/templates/reports/week_report.html
@@ -186,10 +186,10 @@
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 @@