|
|
@@ -367,7 +367,6 @@ public class TaskController extends BladeController {
|
|
|
public R<Object> batchReportTaskArchive(@RequestBody ArchiveTaskBatchReportDTO archiveTaskBatchReportDTO) {
|
|
|
if (ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getUserIds())
|
|
|
|| ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getDataIds())
|
|
|
- || ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getTaskName())
|
|
|
|| ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getBatch())
|
|
|
|| ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getProjectId())
|
|
|
|| ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getContractId())
|
|
|
@@ -377,6 +376,7 @@ public class TaskController extends BladeController {
|
|
|
|
|
|
Map<Long, String> nameMap = jdbcTemplate.query("select id,name from blade_user where is_deleted = 0", new BeanPropertyRowMapper<>(User.class)).stream().collect(Collectors.toMap(User::getId, User::getName, (key1, key2) -> key1));
|
|
|
String[] archiveIds = archiveTaskBatchReportDTO.getDataIds().split(",");
|
|
|
+ Map<Long, String> fileNameMaps = jdbcTemplate.query("select file_name from u_archive_file where file_name is not null and id in (" + archiveTaskBatchReportDTO.getDataIds() + ")", new BeanPropertyRowMapper<>(ArchiveFile.class)).stream().collect(Collectors.toMap(ArchiveFile::getId, ArchiveFile::getFileName, (obj1, obj2) -> obj1));
|
|
|
for (String archiveId : archiveIds) {
|
|
|
//创建task审批任务
|
|
|
Long processInstanceId = SnowFlakeUtil.getId();
|
|
|
@@ -401,7 +401,7 @@ public class TaskController extends BladeController {
|
|
|
task.setTaskContent(ObjectUtil.isNotEmpty(archiveTaskBatchReportDTO.getTaskContent()) ? archiveTaskBatchReportDTO.getTaskContent() : null);
|
|
|
task.setTaskUser(null);
|
|
|
task.setFormDataId(archiveId); //数据指向
|
|
|
- task.setTaskName(archiveTaskBatchReportDTO.getTaskName());
|
|
|
+ task.setTaskName(ObjectUtil.isNotEmpty(fileNameMaps.get(Long.parseLong(archiveId))) ? fileNameMaps.get(Long.parseLong(archiveId)) : "未获取到档案文件任务名");
|
|
|
task.setContractId(archiveTaskBatchReportDTO.getContractId());
|
|
|
task.setProjectId(archiveTaskBatchReportDTO.getProjectId());
|
|
|
task.setBatch(archiveTaskBatchReportDTO.getBatch());
|
|
|
@@ -678,7 +678,7 @@ public class TaskController extends BladeController {
|
|
|
@ApiOperationSupport(order = 6)
|
|
|
@ApiOperation(value = "获取任务类型或任务状态")
|
|
|
public R<List<DictBiz>> queryTaskTypeOrStatus(String typeOrStatus, BladeUser bladeUser) {
|
|
|
- return R.data(jdbcTemplate.query("select dict_key, dict_value from blade_dict_biz where code = '" + typeOrStatus + "' and tenant_id="+bladeUser.getTenantId()+" and parent_id > 0 and is_sealed = 0 and is_deleted = 0 order by sort", new BeanPropertyRowMapper<>(DictBiz.class)));
|
|
|
+ return R.data(jdbcTemplate.query("select dict_key, dict_value from blade_dict_biz where code = '" + typeOrStatus + "' and tenant_id=" + bladeUser.getTenantId() + " and parent_id > 0 and is_sealed = 0 and is_deleted = 0 order by sort", new BeanPropertyRowMapper<>(DictBiz.class)));
|
|
|
}
|
|
|
|
|
|
/**
|
liuyc