bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修饰入库审核库管员返回

This commit is contained in:
csyue 2024-06-12 17:48:54 +08:00
parent c0e7bf8d7c
commit 39f3988079
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @author 10488 * @author 10488
* 修试入库详细 * 修试入库详细
@ -65,4 +67,7 @@ public class RepairTestInputDetailVo {
/** 状态*/ /** 状态*/
@Excel(name = "状态") @Excel(name = "状态")
private String status; private String status;
/** 修试管理入库审核人员*/
private List<String> userIds;
} }

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
View File

@ -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.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.*; 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.RepairTestInputMapper;
import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.mapper.TaskMapper;
import com.bonus.sgzb.material.mapper.TmTaskAgreementMapper; import com.bonus.sgzb.material.mapper.TmTaskAgreementMapper;
@ -40,6 +41,9 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
@Resource @Resource
private TaskMapper taskMapper; private TaskMapper taskMapper;
@Resource
private PurchaseMacodeInfoMapper purchaseMacodeInfoMapper;
@Resource @Resource
private TmTaskAgreementMapper agreementMapper; private TmTaskAgreementMapper agreementMapper;
@ -50,7 +54,13 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
@Override @Override
public List<RepairTestInputDetailVo> getRepairedDetailList(RepairTestInputDto dto) { public List<RepairTestInputDetailVo> getRepairedDetailList(RepairTestInputDto dto) {
return mapper.getRepairedDetailList(dto); List<RepairTestInputDetailVo> repairedDetailList = mapper.getRepairedDetailList(dto);
for (RepairTestInputDetailVo repairTestInputDetailVo : repairedDetailList) {
List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(repairTestInputDetailVo.getTypeId());
userIds.add("1");
repairTestInputDetailVo.setUserIds(userIds);
}
return repairedDetailList;
} }
@Override @Override