|
@@ -5317,7 +5317,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
String dateStr = yearMonth+"-01";
|
|
|
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
LocalDate start = LocalDate.parse(dateStr,df);
|
|
|
- LocalDate end =start.plusMonths(1);
|
|
|
+ LocalDate end =start.plusMonths(1).minusDays(1);
|
|
|
TimeType timeType = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", companyId));
|
|
|
List<HashMap<String, Object>> allReportByProject = reportMapper.geReportByProject(df.format(start),companyId,df.format(end));
|
|
|
String url=timeType.getPushReportUrl();
|