From ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 17:31:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java | 10 +++++++++-
1 files changed, 9 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..79e8823 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);
}
@@ -153,13 +159,15 @@
String before = format.format(listDays.get(i));
if (before.startsWith("0"))
before = before.substring(1, before.length());
+
SignDateVO signDateVO = new SignDateVO();
signDateVO.setDate(before);
+ signDateVO.setLightUp(true);
listSign.add(signDateVO);
}
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