Browse Source

feat(all): 修改配送明细报表校验逻辑

dist.1.3.0
zhaoqiaobo 7 months ago
parent
commit
2f0011dcf5
  1. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

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

@ -251,6 +251,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
public IPage<ReportDetailVO> detailsPage(ReportDetailVO vo, DevilerDetailsQuery query) {
// 添加时间校验
if(ReportUtil.areAllPropertiesEmpty(vo)){
if (ObjectUtil.isEmpty(query.getStartTaskTime()) && ObjectUtil.isEmpty(query.getEndTaskTime()) && ObjectUtil.isEmpty(query.getStartSjsigningTime()) && ObjectUtil.isEmpty(query.getEndSjsigningTime())) {
throw new ServiceException("配送日期和签收日期必须要填一个");
}
if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) && ObjectUtil.isNotEmpty(query.getEndTaskTime())) {
ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
}

Loading…
Cancel
Save