|
|
@@ -135,7 +135,7 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
|
|
|
* @see WmPackageManager#exportPkgInfo(LocalDate, LocalDate) 参考代码（存在冗余待合并）
|
|
|
*/
|
|
|
private List<WmTaskDetailExcelModel> getExportData(HnqzUser user, List<Integer> roles, LocalDate startDate, LocalDate endDate) {
|
|
|
- WmPackageExportScope scope = scorePackageExportService.getWmPackageExportScope(user, roles, startDate, endDate);
|
|
|
+ WmPackageExportScope scope = scorePackageExportService.getWmPackageExportScope(user, roles, null, null);
|
|
|
Map<Integer, SysDept> service = scope.getService();
|
|
|
Map<String, WmDaDrugEntDrugtable> drugtableMap = scope.getDrugtableMap();
|
|
|
List<String> cPkgIds = scope.getCPkgIds();
|
|
|
@@ -161,6 +161,9 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
|
|
|
Wrappers.<WmTask>lambdaQuery()
|
|
|
.in(WmTask::getScorePackageId, cPkgIds)
|
|
|
.between(WmTask::getCreateTime, startDate, endDate));
|
|
|
+ if (CollUtil.isEmpty(tasks)) {
|
|
|
+ throw new BizException("数据导出失败，您选择时间范围暂无数据，请修改后重试");
|
|
|
+ }
|
|
|
|
|
|
// 任务类型名称
|
|
|
List<WmTaskType> taskTypes = taskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
|
