Browse Source

feat(all): 配送明细报表

1 修改配送明细报表权限控制
fix-sign
zhaoqiaobo 3 months ago
parent
commit
15d2a516c0
  1. 11
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

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

@ -485,15 +485,14 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
throw new ServiceException("配送日期必选且时间不超过一个月");
}
} else {
throw new ServiceException("导出时配送日期必填");
}
if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 30;
if (!withinOneMonth) {
throw new ServiceException("签收日期必选且时间不超过一个月");
}
} else {
throw new ServiceException("导出时签收日期必填");
throw new ServiceException("导出时配送日期必填");
}
}
}
} else {
@ -506,17 +505,17 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
throw new ServiceException("配送日期必选且时间不超过7天");
}
} else {
throw new ServiceException("导出时配送日期必填");
}
if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 7;
if (!withinOneMonth) {
throw new ServiceException("签收日期必选且时间不超过7天 ");
}
} else {
throw new ServiceException("导出时签收日期必填");
throw new ServiceException("导出时配送日期必填");
}
}
}
}
List<ReportDetailVO> detailsPage = reportDeliverMapeer.getDetailsPageV3(page, query);
ReportExcelUtil.setExportHeader(response, "配送明细报表");

Loading…
Cancel
Save