|
@@ -60,7 +60,6 @@ import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Collections;
|
|
|
-import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
@@ -1206,18 +1205,17 @@ public class ReportExportServiceImpl implements ReportExportService {
|
|
|
wmTask.setExtIds(strs);
|
|
|
|
|
|
List<WmTask> wmTaskList = wmTaskService.getTaskListByIdsReturnWmtaskInfo(wmTask);
|
|
|
- if (wmTaskList.size() > 0) {
|
|
|
+ if (CollUtil.isNotEmpty(wmTaskList)) {
|
|
|
// 从字典项查询支持的任务类型
|
|
|
List<SysDictItem> scoreTaskTypeDictList = sysDictItemMapper.selectList(Wrappers.<SysDictItem>lambdaQuery()
|
|
|
.eq(SysDictItem::getType, "report_export_task_type")
|
|
|
- .eq(SysDictItem::getDelFlag, "0"));
|
|
|
- List<String> supportedTaskTypeIds = scoreTaskTypeDictList.stream().map(SysDictItem::getValue).collect(Collectors.toList());
|
|
|
+ .eq(SysDictItem::getDelFlag, CommonConstants.STATUS_NORMAL));
|
|
|
+ Set<String> supportedTaskTypeIds = scoreTaskTypeDictList.stream().map(SysDictItem::getValue).collect(Collectors.toSet());
|
|
|
|
|
|
int num = 1;
|
|
|
|
|
|
List<WmTask> emptyImgTasks = wmTaskList.stream()
|
|
|
- .filter(t -> StrUtil.isBlank(t.getTaskInfoImg())
|
|
|
- && supportedTaskTypeIds.contains(t.getTaskTypeId()) && !"801".equals(t.getTaskTypeId()))
|
|
|
+ .filter(t -> StrUtil.isBlank(t.getTaskInfoImg()) && supportedTaskTypeIds.contains(t.getTaskTypeId()) && !"801".equals(t.getTaskTypeId()))
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
log.warn("总任务数:{},空图片任务数:{}", wmTaskList.size(), emptyImgTasks.size());
|
|
@@ -1249,10 +1247,8 @@ public class ReportExportServiceImpl implements ReportExportService {
|
|
|
String strDate2 = dtf2.format(wmTask1.getCreateTime());
|
|
|
map.put("taskTime", strDate2);
|
|
|
map.put("taskUser", sysUserService.getByIdIgnore(wmTask1.getTaskUserId()).getRealname());
|
|
|
-// WmTaskType wmTaskTypeTemp1 = wmTaskTypeService.getById(wmTask1.getTaskTypeId());
|
|
|
map.put("taskTypeId", wmTask1.getTaskTypeId());
|
|
|
map.put("taskNumber", wmTask1.getTaskNumber());
|
|
|
- // 通过配置tasktype的updateUser/createUser来控制截图大小(原有逻辑)
|
|
|
map.put("imgWidth", taskType.getUpdateUser());
|
|
|
map.put("imgHeight", taskType.getCreateUser());
|
|
|
|
|
@@ -1291,7 +1287,7 @@ public class ReportExportServiceImpl implements ReportExportService {
|
|
|
// 图片和签名都要导出
|
|
|
queryWrapper.lambda().in(WmTaskContentConfig::getTaskFiledType, "img", "sign");
|
|
|
List<WmTaskContentConfig> wmTaskContentConfigList = wmTaskContentConfigService.list(queryWrapper);
|
|
|
- if (wmTaskContentConfigList.size() > 0) {
|
|
|
+ if (CollUtil.isNotEmpty(wmTaskContentConfigList)) {
|
|
|
for (WmTaskContentConfig wmt : wmTaskContentConfigList) {
|
|
|
String fileName = wmt.getTaskFiledKey();
|
|
|
String imgsStr = getFieldValueByFieldName(fileName, wmTaskContent);
|
|
@@ -1303,7 +1299,7 @@ public class ReportExportServiceImpl implements ReportExportService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (stringList.size() > 0) {
|
|
|
+ if (CollUtil.isNotEmpty(stringList)) {
|
|
|
map.put("imgList", stringList);
|
|
|
}
|
|
|
|