11
This commit is contained in:
@@ -11,6 +11,7 @@ import com.ruoyi.cai.mapper.UnionTotalMapper;
|
||||
import com.ruoyi.cai.service.ConsumeLogService;
|
||||
import com.ruoyi.cai.service.UnionService;
|
||||
import com.ruoyi.cai.service.UnionTotalService;
|
||||
import org.apache.ibatis.javassist.bytecode.stackmap.TypeData;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -108,7 +109,9 @@ public class UnionTotalServiceImpl extends ServiceImpl<UnionTotalMapper, UnionTo
|
||||
LocalDateTime maxTime = localDate.atTime(LocalTime.MAX);
|
||||
List<UnionTotal> unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime);
|
||||
for (UnionTotal unionTotal : unionTotalList) {
|
||||
UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class).eq(UnionTotal::getCountDate, localDate)
|
||||
UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class)
|
||||
.eq(UnionTotal::getUnionId, unionTotal.getUnionId())
|
||||
.eq(UnionTotal::getCountDate, localDate)
|
||||
.eq(UnionTotal::getDataType, RankDataTypeEnum.DAY.getCode()).last("limit 1"));
|
||||
if (one == null) {
|
||||
one = new UnionTotal();
|
||||
@@ -139,8 +142,11 @@ public class UnionTotalServiceImpl extends ServiceImpl<UnionTotalMapper, UnionTo
|
||||
LocalDateTime maxTime = localDate.plusDays(6).atTime(LocalTime.MAX);
|
||||
List<UnionTotal> unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime);
|
||||
for (UnionTotal unionTotal : unionTotalList) {
|
||||
UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class).eq(UnionTotal::getCountDate, localDate)
|
||||
.eq(UnionTotal::getDataType, RankDataTypeEnum.WEEK.getCode()).last("limit 1"));
|
||||
UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class)
|
||||
.eq(UnionTotal::getUnionId, unionTotal.getUnionId())
|
||||
.eq(UnionTotal::getCountDate, localDate)
|
||||
.eq(UnionTotal::getDataType, RankDataTypeEnum.WEEK.getCode())
|
||||
.last("limit 1"));
|
||||
if (one == null) {
|
||||
one = new UnionTotal();
|
||||
one.setUnionId(unionTotal.getUnionId());
|
||||
|
||||
Reference in New Issue
Block a user