|
|
@@ -71,12 +71,13 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
|
startDate1 = LocalDate.parse(startDate);
|
|
|
endDate1 = LocalDate.parse(endDate);
|
|
|
}
|
|
|
- //固定返回七条数据，没有内容也要设置时间给前端渲染
|
|
|
List<LocalDate> dates = new ArrayList<>();
|
|
|
- while (!startDate1.isAfter(endDate1)) {
|
|
|
- dates.add(startDate1);
|
|
|
- startDate1 = startDate1.plusDays(1);
|
|
|
+ LocalDate tempDate = startDate1;
|
|
|
+ while (!tempDate.isAfter(endDate1)) {
|
|
|
+ dates.add(tempDate);
|
|
|
+ tempDate = tempDate.plusDays(1);
|
|
|
}
|
|
|
+ //固定返回七条数据，没有内容也要设置时间给前端渲染
|
|
|
LambdaQueryWrapper<PmWorkReport> queryWrapperR = Wrappers.lambdaQuery();
|
|
|
queryWrapperR.select(PmWorkReport::getId, PmWorkReport::getReportDate, PmWorkReport::getSubmitDate, PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo)
|
|
|
.eq(PmWorkReport::getSubmitterId, SecurityUtils.getUserId())
|
