From ff162d0cd52563bfe08c17ce7d2f76969d7c3ec9 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 19 Nov 2024 15:18:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/domain/vo/KeyValueVO.java | 9 +++++++++ .../repair/mapper/RepairAuditDetailsMapper.java | 4 ++-- .../impl/RepairAuditDetailsServiceImpl.java | 12 ++++++++---- .../material/lease/LeaseApplyDetailsMapper.xml | 2 +- .../material/repair/RepairAuditDetailsMapper.xml | 16 ++++++++-------- 5 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/KeyValueVO.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/KeyValueVO.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/KeyValueVO.java new file mode 100644 index 00000000..0c28fca9 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/KeyValueVO.java @@ -0,0 +1,9 @@ +package com.bonus.common.biz.domain.vo; + +import lombok.Data; + +@Data +public class KeyValueVO { + private String mapKey; + private String mapValue; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index 77313a48..0268cb2e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -1,12 +1,12 @@ package com.bonus.material.repair.mapper; import java.util.List; -import java.util.Map; import com.bonus.material.repair.domain.RepairAuditDetails; import com.bonus.material.repair.domain.RepairPart; import com.bonus.material.repair.domain.RepairRecord; import com.bonus.material.repair.domain.RepairTaskDetails; +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 org.apache.ibatis.annotations.Param; @@ -89,7 +89,7 @@ public interface RepairAuditDetailsMapper { * 根据taskIds批量查询规格名称---批量 * @param taskIds 任务id集合 */ - Map selectTypeNamesByTaskIds(@Param("taskIds") List taskIds); + List selectTypeNamesByTaskIds(@Param("taskIds") List taskIds); List selectRepairAuditDetailsByTaskId(Long taskId); 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 1e47370a..34f10779 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 @@ -13,6 +13,7 @@ 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; @@ -24,6 +25,8 @@ 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.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.service.IRepairAuditDetailsService; @@ -38,6 +41,7 @@ import javax.annotation.Resource; * @date 2024-10-16 */ @Service +@Slf4j public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService { @Resource @@ -110,14 +114,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(taskId); if (typeName != null) { scrapApplyDetailsVO.setItemType(typeName); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index 3deba40e..557c903a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(lad.pre_num,0) as pre_num, IFNULL(lad.audit_num,0) as audit_num, IFNULL(lad.al_num,0) as al_num, - lad.status, mt.unit_name, + IFNULL(lad.status,0) as status, mt.unit_name, lad.create_by, lad.create_time, lad.update_by, lad.update_time, lad.remark, lad.company_id from lease_apply_details lad diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 111a8241..fe3181ea 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -457,21 +457,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update repair_apply_record set status = 1,update_time = now() where id = #{id} - select - task_id, GROUP_CONCAT(type_name) as typeName + task_id as mapKey, GROUP_CONCAT(type_name) as mapValue from (select distinct rad.task_id, mt1.type_name from repair_audit_details rad left join ma_type mt on rad.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id - where rad.task_id in - - #{taskId} - + + where rad.task_id in + + #{taskId} + + ) t GROUP BY task_id - \ No newline at end of file