diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index fd28ec22..11113ddf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -1,11 +1,8 @@ package com.bonus.material.repair.service.impl; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - import cn.hutool.core.collection.CollectionUtil; import com.bonus.common.biz.constant.MaterialConstants; +import com.bonus.common.biz.domain.vo.KeyValueVO; import com.bonus.common.biz.enums.RepairTaskStatusEnum; import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; @@ -13,26 +10,27 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.repair.domain.*; -import com.bonus.common.biz.domain.vo.KeyValueVO; import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; import com.bonus.material.repair.domain.vo.ScrapAudit; +import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.mapper.RepairInputDetailsMapper; +import com.bonus.material.repair.service.IRepairAuditDetailsService; import com.bonus.material.scrap.domain.ScrapApplyDetails; import com.bonus.material.scrap.mapper.ScrapApplyDetailsMapper; +import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; -import com.bonus.material.task.domain.TmTask; -import javax.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; -import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; -import com.bonus.material.repair.service.IRepairAuditDetailsService; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.validation.constraints.NotNull; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** * 修试审核详细Service业务层处理 @@ -113,14 +111,14 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService .collect(Collectors.toList()); // 批量查询 typeName - Map typeNameMap = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds); - + List keyValueList = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds); // 设置 itemType - if (CollectionUtil.isNotEmpty(typeNameMap)) { + if (CollectionUtil.isNotEmpty(keyValueList)) { + Map keyValueMap = keyValueList.stream().collect(Collectors.toMap(KeyValueVO::getMapKey, KeyValueVO::getMapValue)); for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { Long taskId = scrapApplyDetailsVO.getTaskId(); if (taskId != null) { - String typeName = typeNameMap.get(taskId); + String typeName = keyValueMap.get(String.valueOf(taskId)); if (typeName != null) { scrapApplyDetailsVO.setItemType(typeName); } @@ -469,7 +467,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService try { // 调用 Mapper 方法进行批量更新 - return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(ids,repairAuditDetails.get(0).getStatus()); + return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(ids, String.valueOf(repairAuditDetails.get(0).getStatus())); } catch (Exception e) { throw new ServiceException("错误信息描述"); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 1665af0b..18bacca9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -682,7 +682,7 @@ public class RepairServiceImpl implements RepairService { @Override public AjaxResult rejectRepair(@NotNull List taskList) { try { - taskList.forEach(taskId -> taskMapper.updateTmTaskStatusByTaskId(taskId, RepairTaskStatusEnum.TASK_STATUS_REJECT.getStatus())); + taskList.forEach(taskId -> taskMapper.updateTaskStatus(String.valueOf(taskId), RepairTaskStatusEnum.TASK_STATUS_REJECT.getStatus())); } catch (DataAccessException e) { System.err.println(e.getMessage()); return AjaxResult.error("数据库SQL修改执行失败" + e.getMessage()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index ebcc80ba..0bbb8c7b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -52,7 +52,12 @@ public interface TmTaskMapper { */ int updateTmTask(TmTask tmTask); - int updateTaskStatus(@Param("taskId") String taskId, @Param("newStatus")int newStatus); + /** + * 根据任务id更新任务状态 -- 批量、限制状态 + * @param taskId 任务id 必传 + * @param newStatus 新状态 + */ + int updateTaskStatus(@Param("taskId") String taskId, @Param("newStatus") int newStatus); /** * 删除任务