Merge branch 'refs/heads/feature-log-lihb-20250820' into dev

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogServiceImpl.java

@@ -329,13 +329,22 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
             }
         });
         if(CollectionUtil.isNotEmpty(contractLogMonthPacks)){
-            List<String> collect1 = contractLogMonthPacks.stream().map(ContractLogMonthPack::getRecordTime).collect(Collectors.toList());
-            //删除文件
-            List<ContractLogMonthPack> list = contractLogMonthPackService.list(Wrappers.<ContractLogMonthPack>lambdaQuery()
-                    .eq(ContractLogMonthPack::getContractId, logVo.getContractId())
-                    .eq(ContractLogMonthPack::getWbsNodeId, logVo.getWbsNodeId())
-                    .in(ContractLogMonthPack::getRecordTime, collect1));
+            List<String> collect1 = contractLogMonthPacks.stream().map(map ->{
+                DateTime dateTime = DateUtil.parse(map.getRecordTime(), "yyyyMMdd");
+                return dateTime.toString("yyyyMM");
+            }).collect(Collectors.toList());
+            List<ContractLogMonthPack> list = new ArrayList<>();
+            for (String date : collect1) {
+                //删除文件
+                List<ContractLogMonthPack> listed = contractLogMonthPackService.list(Wrappers.<ContractLogMonthPack>lambdaQuery()
+                        .eq(ContractLogMonthPack::getContractId, logVo.getContractId())
+                        .eq(ContractLogMonthPack::getWbsNodeId, logVo.getWbsNodeId())
+                        .likeRight(ContractLogMonthPack::getRecordTime, date));
 
+                if(CollectionUtil.isNotEmpty(listed)){
+                    list.addAll(listed);
+                }
+            }
             if(CollectionUtil.isNotEmpty(list)){
                 //删除文件
                 list.forEach(f -> {