供应商导入修改
This commit is contained in:
@ -26,10 +26,8 @@ import org.dromara.tender.mapper.TenderSupplierInputMapper;
|
|||||||
import org.dromara.tender.service.ITenderSupplierInputService;
|
import org.dromara.tender.service.ITenderSupplierInputService;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.List;
|
import java.util.stream.Collectors;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import static org.dromara.common.constant.MinioPathConstant.SupplierInput;
|
import static org.dromara.common.constant.MinioPathConstant.SupplierInput;
|
||||||
|
|
||||||
@ -219,9 +217,20 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean importData(List<TenderSupplierInputVo> tenderSupplierInputVos, Long projectId) {
|
public boolean importData(List<TenderSupplierInputVo> tenderSupplierInputVos, Long projectId) {
|
||||||
|
List<TenderSupplierInputVo> tenderSupplierInputVos1 = tenderSupplierInputVos.stream()
|
||||||
|
.collect(Collectors.collectingAndThen(
|
||||||
|
Collectors.toCollection(() ->
|
||||||
|
new TreeSet<>(Comparator.comparing(item ->
|
||||||
|
item.getSupplierName() + "_" + item.getSupplierPerson() + "_" + item.getSupplierCode()))),
|
||||||
|
ArrayList::new
|
||||||
|
));
|
||||||
List<TenderSupplierInput> tenderSupplierInputs = new ArrayList<>();
|
List<TenderSupplierInput> tenderSupplierInputs = new ArrayList<>();
|
||||||
for (TenderSupplierInputVo tenderSupplierInputVo : tenderSupplierInputVos) {
|
for (TenderSupplierInputVo tenderSupplierInputVo : tenderSupplierInputVos1) {
|
||||||
Long count = baseMapper.selectCount(new LambdaQueryWrapper<TenderSupplierInput>().eq(TenderSupplierInput::getSupplierCode, tenderSupplierInputVo.getSupplierCode()));
|
Long count = baseMapper.selectCount(new LambdaQueryWrapper<TenderSupplierInput>()
|
||||||
|
.eq(TenderSupplierInput::getProjectId,projectId)
|
||||||
|
.eq(TenderSupplierInput::getSupplierCode, tenderSupplierInputVo.getSupplierCode())
|
||||||
|
.eq(TenderSupplierInput::getSupplierName, tenderSupplierInputVo.getSupplierName())
|
||||||
|
.eq(TenderSupplierInput::getSupplierPerson, tenderSupplierInputVo.getSupplierPerson()));
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user