Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -255,7 +255,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 				ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
 			}
 			if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){
-				ReportUtil.dateIsWithinOneMonth(null, query.getStartTaskTime(), query.getEndTaskTime(), "签收日期");
+				ReportUtil.dateIsWithinOneMonth(null, query.getStartSjsigningTime(), query.getEndSjsigningTime(), "签收日期");
 			}
 		}
 		Integer current = query.getCurrent();
@@ -333,8 +333,13 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) {
 		// 添加时间校验
 		if(ReportUtil.areAllPropertiesEmpty(vo)){
+			if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) && ObjectUtil.isNotEmpty(query.getEndTaskTime())) {
 				ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
 			}
+			if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){
+				ReportUtil.dateIsWithinOneMonth(null, query.getStartSjsigningTime(), query.getEndSjsigningTime(), "签收日期");
+			}
+		}
 		QueryWrapper<ReportDetailVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class);
 		detailsCustomQuery(query, queryWrapper);
 		// 仓库权限

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -2988,10 +2988,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	private R<Object> extracted(Long questId, QuestDetailEntity questDetail) {
 
 
-		List<TaskQuestChildVO> taskQuestChildVOS = bladeRedis.get(RedisKeyConstant.TASK_QUEST_CHILD_KEY);
+		List<TaskQuestChildVO> taskQuestChildVOS = bladeRedis.get(RedisKeyConstant.TASK_QUEST_CHILD_KEY+questId);
 		if (taskQuestChildVOS == null) {
 			taskQuestChildVOS = taskQuestChildService.selectlistByMasterId(questId);
-			bladeRedis.setEx(RedisKeyConstant.TASK_QUEST_CHILD_KEY, taskQuestChildVOS, 1000L);
+			if(taskQuestChildVOS!=null){
+				bladeRedis.setEx(RedisKeyConstant.TASK_QUEST_CHILD_KEY+questId, taskQuestChildVOS, 1000L);
+			}
 		}