|  |  | @ -113,8 +113,10 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (null == statDataDetailRequest) { |  |  |  |         if (null == statDataDetailRequest) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             return Collections.emptyList(); |  |  |  |             return Collections.emptyList(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (null == statDataDetailRequest.getPage() && null == statDataDetailRequest.getLimit()) { |  |  |  | 
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             PageHelper.offsetPage((statDataDetailRequest.getPage() - 1) * statDataDetailRequest.getLimit(), statDataDetailRequest.getLimit()); |  |  |  |         if (statDataDetailRequest.getPage() != null) { | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             int offset = (statDataDetailRequest.getPage() - 1) * statDataDetailRequest.getLimit(); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             PageHelper.offsetPage(offset, statDataDetailRequest.getLimit()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |         return statQuarterDao.filterList(statDataDetailRequest); |  |  |  |         return statQuarterDao.filterList(statDataDetailRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
	
		
		
			
				
					|  |  | @ -147,7 +149,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { | 
			
		
	
		
		
			
				
					
					|  |  |  |             DateTime dateTime = DateUtil.offsetDay(yesterday, +1); |  |  |  |             DateTime dateTime = DateUtil.offsetDay(yesterday, +1); | 
			
		
	
		
		
			
				
					
					|  |  |  |             statOrderEntity.setDate(dateTime); |  |  |  |             statOrderEntity.setDate(dateTime); | 
			
		
	
		
		
			
				
					
					|  |  |  |             statOrderEntity.setTitle(yesterday.year() + " 年 " + yesterday.quarter() + " 季度出入库汇总"); |  |  |  |             statOrderEntity.setTitle(yesterday.year() + " 年 " + yesterday.quarter() + " 季度出入库汇总"); | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |             statOrderEntity.setInvCode(key); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |             Date updateTime = new Date(); |  |  |  |             Date updateTime = new Date(); | 
			
		
	
		
		
			
				
					
					|  |  |  |             statOrderEntity.setUpdateTime(updateTime); |  |  |  |             statOrderEntity.setUpdateTime(updateTime); | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -184,8 +186,10 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (CollUtil.isNotEmpty(dataList)) { |  |  |  |         if (CollUtil.isNotEmpty(dataList)) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             for (IoStatQuarterEntity statDayEntity : dataList) { |  |  |  |             for (IoStatQuarterEntity statDayEntity : dataList) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 if (Long.valueOf(statDayEntity.getRelIdFk()).equals(orderDetailResultEntity.getBindRlFk()) && statDayEntity.getDeptCode().equals(orderDetailResultEntity.getDeptCode())) { |  |  |  |                 if (statDayEntity.getRelIdFk().equals(orderDetailResultEntity.getBindRlFk()) | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                     if ((StrUtil.isNotBlank(statDayEntity.getBatchNo()) && StrUtil.isNotBlank(orderDetailResultEntity.getBatchNo())) && statDayEntity.getBatchNo().equals(orderDetailResultEntity.getBatchNo())) { |  |  |  |                         && statDayEntity.getInvCode().equals(orderDetailResultEntity.getInvCode())) { | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     if ((StrUtil.isNotBlank(statDayEntity.getBatchNo()) && StrUtil.isNotBlank(orderDetailResultEntity.getBatchNo())) | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                             && statDayEntity.getBatchNo().equals(orderDetailResultEntity.getBatchNo())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                         return statDayEntity; |  |  |  |                         return statDayEntity; | 
			
		
	
		
		
			
				
					
					|  |  |  |                     } else if (StrUtil.isBlank(statDayEntity.getBatchNo()) && StrUtil.isBlank(orderDetailResultEntity.getBatchNo())) { |  |  |  |                     } else if (StrUtil.isBlank(statDayEntity.getBatchNo()) && StrUtil.isBlank(orderDetailResultEntity.getBatchNo())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                         return statDayEntity; |  |  |  |                         return statDayEntity; | 
			
		
	
	
		
		
			
				
					|  |  | @ -262,6 +266,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { | 
			
		
	
		
		
			
				
					
					|  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode()); |  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo()); |  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode()); |  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "invCode", ioOrderDetailResultEntity.getInvCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         return wrapper; |  |  |  |         return wrapper; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -329,7 +334,8 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     List<IoStatQuarterEntity> filtered = newIoStatDayEntity.stream().filter(all -> |  |  |  |                     List<IoStatQuarterEntity> filtered = newIoStatDayEntity.stream().filter(all -> | 
			
		
	
		
		
			
				
					
					|  |  |  |                             Objects.equals(all.getBatchNo(), notComment.getBatchNo()) // 使用 Objects.equals 来进行非空判断
 |  |  |  |                             Objects.equals(all.getBatchNo(), notComment.getBatchNo()) // 使用 Objects.equals 来进行非空判断
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                                     && Objects.equals(all.getRelIdFk(), notComment.getRelIdFk()) |  |  |  |                                     && Objects.equals(all.getRelIdFk(), notComment.getRelIdFk()) | 
			
		
	
		
		
			
				
					
					|  |  |  |                                     && Objects.equals(all.getDeptCode(), notComment.getDeptCode())) |  |  |  |                                     && Objects.equals(all.getDeptCode(), notComment.getDeptCode()) | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                                     && Objects.equals(all.getInvCode(), notComment.getInvCode())) | 
			
		
	
		
		
			
				
					
					|  |  |  |                             .collect(Collectors.toList()); |  |  |  |                             .collect(Collectors.toList()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     return filtered.isEmpty(); |  |  |  |                     return filtered.isEmpty(); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 }).collect(Collectors.toList()); |  |  |  |                 }).collect(Collectors.toList()); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |