|
@@ -10106,6 +10106,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
for (Map<String, Object> map : mapList) {
|
|
for (Map<String, Object> map : mapList) {
|
|
|
Map<String,Object> objectMap=new HashMap<>();
|
|
Map<String,Object> objectMap=new HashMap<>();
|
|
|
Object date = map.get("createDate");
|
|
Object date = map.get("createDate");
|
|
|
|
|
+
|
|
|
//去掉sql返回的毫秒值
|
|
//去掉sql返回的毫秒值
|
|
|
Timestamp timestamp = (Timestamp) map.get("createTime");
|
|
Timestamp timestamp = (Timestamp) map.get("createTime");
|
|
|
LocalDate createDate = LocalDate.parse(String.valueOf(date));
|
|
LocalDate createDate = LocalDate.parse(String.valueOf(date));
|
|
@@ -10133,6 +10134,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (user.getName().equals("徐婷-重庆") && DateTimeFormatter.ofPattern("yyyy-MM-dd").format(createTimeDate).equals("2025-10-10")) {
|
|
|
|
|
+ System.out.println("有记录:徐婷-重庆,2025-10-10");
|
|
|
|
|
+ }
|
|
|
if(createTimeDate.isBefore(createDate)||createTimeDate.isEqual(createDate)){
|
|
if(createTimeDate.isBefore(createDate)||createTimeDate.isEqual(createDate)){
|
|
|
num++;
|
|
num++;
|
|
|
objectMap.put((LocalDate.parse(String.valueOf(date)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))),MessageUtils.message("entry.timely")+"/"+MessageUtils.message("entry.SubTime")+createTimeDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
|
objectMap.put((LocalDate.parse(String.valueOf(date)).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))),MessageUtils.message("entry.timely")+"/"+MessageUtils.message("entry.SubTime")+createTimeDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|