From 39f3988079cad2430ce4a2375d02ec96a16822b7 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Wed, 12 Jun 2024 17:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=85=A5=E5=BA=93=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=BA=93=E7=AE=A1=E5=91=98=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/domain/RepairTestInputDetailVo.java | 5 +++++ .../service/impl/RepairTestInputServiceImpl.java | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java index 9f48bf3f..6edad573 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java @@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain; import com.bonus.sgzb.common.core.annotation.Excel; import lombok.Data; +import java.util.List; + /** * @author 10488 * 修试入库详细 @@ -65,4 +67,7 @@ public class RepairTestInputDetailVo { /** 状态*/ @Excel(name = "状态") private String status; + + /** 修试管理入库审核人员*/ + private List userIds; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index fa790853..313f6e6e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; +import com.bonus.sgzb.material.mapper.PurchaseMacodeInfoMapper; import com.bonus.sgzb.material.mapper.RepairTestInputMapper; import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.mapper.TmTaskAgreementMapper; @@ -40,6 +41,9 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { @Resource private TaskMapper taskMapper; + @Resource + private PurchaseMacodeInfoMapper purchaseMacodeInfoMapper; + @Resource private TmTaskAgreementMapper agreementMapper; @@ -50,7 +54,13 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { @Override public List getRepairedDetailList(RepairTestInputDto dto) { - return mapper.getRepairedDetailList(dto); + List repairedDetailList = mapper.getRepairedDetailList(dto); + for (RepairTestInputDetailVo repairTestInputDetailVo : repairedDetailList) { + List userIds = purchaseMacodeInfoMapper.selectKeepUser(repairTestInputDetailVo.getTypeId()); + userIds.add("1"); + repairTestInputDetailVo.setUserIds(userIds); + } + return repairedDetailList; } @Override