From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
index 7b14fe8..6ba9b92 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
@@ -52,6 +52,12 @@
@Override
+ public IntegralTaskClass selectByPrimaryKey(Long id) {
+ return integralTaskClassMapper.selectByPrimaryKey(id);
+ }
+
+
+ @Override
public List<IntegralTaskClassVO> getIntegralTaskClassVO(Long uid, long start, int count) {
return integralTaskClassMapper.getIntegralTaskClassVO(start, count);
}
@@ -159,7 +165,7 @@
}
for (int i = 1; i <= 7- listDays.size(); i ++) {
- String after = format.format(DateUtil.reduceDay(i, date));
+ String after = format.format(DateUtil.plusDayDate(i, date));
if (after.startsWith("0"))
after = after.substring(1, after.length());
--
Gitblit v1.8.0