|
|
|
@ -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(); |
|
|
|
@ -337,7 +337,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(), "签收日期"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
QueryWrapper<ReportDetailVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); |
|
|
|
|