|
|
|
@ -23,6 +23,7 @@ import jnpf.constant.MsgCode;
|
|
|
|
|
import jnpf.contractfile.entity.ContractFileEntity;
|
|
|
|
|
import jnpf.contractfile.entity.Contract_item0Entity;
|
|
|
|
|
import jnpf.contractfile.entity.Contract_item1Entity;
|
|
|
|
|
import jnpf.contractfile.mapper.ContractFileMapper;
|
|
|
|
|
import jnpf.contractfile.model.contractfile.*;
|
|
|
|
|
import jnpf.contractfile.service.ContractFileService;
|
|
|
|
|
import jnpf.contractfile.service.Contract_item0Service;
|
|
|
|
@ -55,8 +56,10 @@ import java.io.FileOutputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* contractFile
|
|
|
|
@ -91,6 +94,9 @@ public class ContractFileController {
|
|
|
|
|
@Autowired
|
|
|
|
|
private YozoUtils yozoUtils;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private ContractFileMapper contractFileMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 采购合同列表
|
|
|
|
@ -306,8 +312,38 @@ public class ContractFileController {
|
|
|
|
|
return ActionResult.fail("合同导入对方合同号是必填项");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<ContractFileModel> contractFileModelList = new ArrayList<>();
|
|
|
|
|
List<ContractFileModel> duplicates = dataList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
System.out.println("重复数据:" + duplicates);
|
|
|
|
|
for (ContractFileModel contractFileModel:duplicates){
|
|
|
|
|
QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper
|
|
|
|
|
.eq("contract_name", contractFileModel.getContractName())
|
|
|
|
|
.eq("contract_code", contractFileModel.getContractCode())
|
|
|
|
|
.eq("name", contractFileModel.getName())
|
|
|
|
|
.eq("orgnize_id", contractFileModel.getOrgnizeId())
|
|
|
|
|
.eq("department_id", contractFileModel.getDepartmentId())
|
|
|
|
|
.eq("contract_no",contractFileModel.getContractNo());
|
|
|
|
|
List<ContractFileEntity> list = contractFileMapper.selectList(queryWrapper);
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
map.put("contractName", contractFileModel.getContractName());
|
|
|
|
|
map.put("contractCode", contractFileModel.getContractCode());
|
|
|
|
|
map.put("name", contractFileModel.getName());
|
|
|
|
|
map.put("orgnizeId", contractFileModel.getOrgnizeId());
|
|
|
|
|
map.put("departmentId", contractFileModel.getDepartmentId());
|
|
|
|
|
map.put("contractNo", contractFileModel.getContractNo());
|
|
|
|
|
List<ContractFileEntity> list1 = contractFileMapper.queryContractFileEntityByImport(map);
|
|
|
|
|
if (list1.size() > 0){
|
|
|
|
|
System.out.println(list1);
|
|
|
|
|
}else if (list.size() > 0){
|
|
|
|
|
System.out.println(list);
|
|
|
|
|
}else {
|
|
|
|
|
contractFileModelList=duplicates;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
//导入数据
|
|
|
|
|
ContractfileImportVO result = contractFileService.importData(dataList);
|
|
|
|
|
ContractfileImportVO result = contractFileService.importData(contractFileModelList);
|
|
|
|
|
return ActionResult.success(result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|