|
@@ -98,7 +98,7 @@ public class contractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
|
|
|
|
|
|
|
|
baseMapper.insert(contractEntity);
|
|
baseMapper.insert(contractEntity);
|
|
|
if (contractDto.getSupplierIdList() != null) {
|
|
if (contractDto.getSupplierIdList() != null) {
|
|
|
- contractSupplierService.saveAndUpdate(supplierIdList, contractEntity.getId());
|
|
|
|
|
|
|
+ contractSupplierService.saveAndUpdate(contractDto.getContractType(),supplierIdList, contractEntity.getId());
|
|
|
}
|
|
}
|
|
|
if (contractDto.getFilePathIdList() != null) {
|
|
if (contractDto.getFilePathIdList() != null) {
|
|
|
contractFileService.saveAndUpdate(contractDto.getFilePathIdList(), contractEntity.getId());
|
|
contractFileService.saveAndUpdate(contractDto.getFilePathIdList(), contractEntity.getId());
|
|
@@ -125,7 +125,7 @@ public class contractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
|
|
|
// }
|
|
// }
|
|
|
|
|
|
|
|
baseMapper.updateById(contractEntity);
|
|
baseMapper.updateById(contractEntity);
|
|
|
- contractSupplierService.saveAndUpdate(contractDto.getSupplierIdList(), contractEntity.getId());
|
|
|
|
|
|
|
+ contractSupplierService.saveAndUpdate(contractDto.getContractType(),contractDto.getSupplierIdList(), contractEntity.getId());
|
|
|
|
|
|
|
|
contractFileService.saveAndUpdate(contractDto.getFilePathIdList(), contractEntity.getId());
|
|
contractFileService.saveAndUpdate(contractDto.getFilePathIdList(), contractEntity.getId());
|
|
|
}
|
|
}
|
|
@@ -335,7 +335,7 @@ public class contractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
|
|
|
contractEntity.setInternalCompanyName(interName);
|
|
contractEntity.setInternalCompanyName(interName);
|
|
|
baseMapper.insert(contractEntity);
|
|
baseMapper.insert(contractEntity);
|
|
|
if (contractDto.getSupplierIdList() != null) {
|
|
if (contractDto.getSupplierIdList() != null) {
|
|
|
- contractSupplierService.saveAndUpdate(supplierIdList, contractEntity.getId());
|
|
|
|
|
|
|
+ contractSupplierService.saveAndUpdate(contractDto.getContractType(),supplierIdList, contractEntity.getId());
|
|
|
}
|
|
}
|
|
|
if (contractDto.getFilePathIdList() != null) {
|
|
if (contractDto.getFilePathIdList() != null) {
|
|
|
contractFileService.saveAndUpdate(contractDto.getFilePathIdList(), contractEntity.getId());
|
|
contractFileService.saveAndUpdate(contractDto.getFilePathIdList(), contractEntity.getId());
|