Pārlūkot izejas kodu

修复美莱德填报及时率错误Bug

QuYueTing 1 mēnesi atpakaļ
vecāks
revīzija
8abb8a4140

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -10106,6 +10106,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 for (Map<String, Object> map : mapList) {
                     Map<String,Object> objectMap=new HashMap<>();
                     Object date = map.get("createDate");
+
                     //去掉sql返回的毫秒值
                     Timestamp timestamp = (Timestamp) map.get("createTime");
                     LocalDate createDate = LocalDate.parse(String.valueOf(date));
@@ -10133,6 +10134,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             }
                             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)){
                         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")));

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/ReportMapper.xml

@@ -1118,7 +1118,7 @@
         FROM report_log r2
         FORCE INDEX (idx_report_log_sub)  -- 强制子查询使用索引
         WHERE r2.operator_id = rl.operator_id
-        AND r2.create_date between #{startDate} and #{endDate}
+        AND r2.create_date = rl.create_date
         AND r2.operate_date > rl.operate_date
         AND r2.msg LIKE CONCAT(`user`.name, '%撤销了日报')
         )