diff --git a/src/main/java/com/supervision/common/constant/TaskRecordConstants.java b/src/main/java/com/supervision/common/constant/TaskRecordConstants.java index fe87e8e..5eabe64 100644 --- a/src/main/java/com/supervision/common/constant/TaskRecordConstants.java +++ b/src/main/java/com/supervision/common/constant/TaskRecordConstants.java @@ -3,10 +3,10 @@ package com.supervision.common.constant; public class TaskRecordConstants { // 任务名称前缀 public static final String TASK_NAME_PREFIX = "任务"; - public static final String TASK_NAME_PREFIX_TYPE_ALL_CASE = "AllCase"; - public static final String TASK_NAME_PREFIX_TYPE_SPECIFIED_CASE = "CasePart"; - public static final String TASK_NAME_PREFIX_TYPE_SPECIFIED_RECORD = "CaseRecord"; - public static final String TASK_NAME_PREFIX_TYPE_SPECIFIED_EVIDENCE = "CaseEvidence"; + public static final String TASK_NAME_PREFIX_TYPE_ALL_CASE = "全部案件"; + public static final String TASK_NAME_PREFIX_TYPE_SPECIFIED_CASE = "指定案件"; + public static final String TASK_NAME_PREFIX_TYPE_SPECIFIED_RECORD = "指定笔录"; + public static final String TASK_NAME_PREFIX_TYPE_SPECIFIED_EVIDENCE = "指定证据"; // 任务类型 public static final String TASK_TYPE_ALL_CASE = "0"; public static final String TASK_TYPE_SPECIFIED_CASE = "1"; diff --git a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java index 6df2615..106661b 100644 --- a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.common.constant.TaskRecordConstants; import com.supervision.constant.DataStatus; import com.supervision.neo4j.service.Neo4jService; import com.supervision.police.domain.*; @@ -68,27 +67,7 @@ public class TaskRecordServiceImpl extends ServiceImpl a + "," + b).orElse("")); - taskCaseRecord.setStatus(TaskRecordConstants.TASK_STATUS_WAITING); + taskCaseRecord.setStatus(TASK_STATUS_WAITING); taskCaseRecordService.save(taskCaseRecord); for (String id : ids) { Map params = new HashMap<>(); @@ -212,7 +191,7 @@ public class TaskRecordServiceImpl extends ServiceImpl iPage = super.getBaseMapper().queryTaskList(taskInfo, Page.of(page, size)); - if (iPage.getRecords().isEmpty()){ + if (iPage.getRecords().isEmpty()) { return iPage; } @@ -223,18 +202,18 @@ public class TaskRecordServiceImpl extends ServiceImpl caseNameMap = CollUtil.isEmpty(caseIds) ? new HashMap<>() : modelCaseService.listByIds(caseIds).stream().collect(Collectors.toMap(ModelCase::getId, ModelCase::getCaseName)); return iPage.convert(taskInfoDTO -> { - if (StrUtil.isEmpty(taskInfoDTO.getCaseName()) && StrUtil.isNotEmpty(taskInfoDTO.getCaseId())){ + if (StrUtil.isEmpty(taskInfoDTO.getCaseName()) && StrUtil.isNotEmpty(taskInfoDTO.getCaseId())) { String caseNames = Arrays.stream(taskInfoDTO.getCaseId().split(",")) .map(caseId -> caseNameMap.getOrDefault(caseId, "")).filter(StrUtil::isNotEmpty).distinct().collect(Collectors.joining(",")); taskInfoDTO.setCaseName(caseNames); } - if (StrUtil.isEmpty(taskInfoDTO.getCaseName()) && StrUtil.equals(taskInfoDTO.getTaskType(), "0")){ + if (StrUtil.isEmpty(taskInfoDTO.getCaseName()) && StrUtil.equals(taskInfoDTO.getTaskType(), "0")) { // 全部案件 taskInfoDTO.setCaseName("全部"); } - if (StrUtil.isNotEmpty(taskInfoDTO.getPromptName())){ + if (StrUtil.isNotEmpty(taskInfoDTO.getPromptName())) { taskInfoDTO.setPromptName("全部"); } return taskInfoDTO; @@ -244,12 +223,12 @@ public class TaskRecordServiceImpl extends ServiceImpl currentDayTaskList = list(new LambdaQueryWrapper<>(new TaskRecord()).ge(TaskRecord::getCreateTime, LocalDateTime.now().withHour(0).withMinute(0).withSecond(0))); + // 计算后缀 + int maxSuffix = currentDayTaskList.stream() + .map(taskRecord -> taskRecord.getName().substring(taskRecord.getName().length() - 3)) + .mapToInt(Integer::parseInt) + .max() + .orElse(0); + name += String.format("%03d", maxSuffix + 1); + return name; + } }