From 064d3b168ec0761e5dbe0c4ff68a838c1662f7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 5 Jan 2026 14:30:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(import):=20=E6=89=B9=E9=87=8F=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?ID=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为所有批量导入接口增加可选的companyId参数 - 在导入过程中将companyId设置到实体对象中 - 修复客户导入时的租户ID冲突处理逻辑 - 添加数据完整性验证异常处理机制 - 实现字符串字段的标准化处理功能 - 优化重复数据检测和更新逻辑 --- .../CreditBreachOfTrustController.java | 6 +- .../CreditCaseFilingController.java | 6 +- .../controller/CreditCompanyController.java | 3 +- .../CreditCompetitorController.java | 6 +- .../CreditCourtAnnouncementController.java | 6 +- .../CreditCourtSessionController.java | 6 +- .../controller/CreditCustomerController.java | 95 +++++++++++++++---- .../CreditDeliveryNoticeController.java | 6 +- .../controller/CreditExternalController.java | 6 +- .../CreditFinalVersionController.java | 6 +- .../controller/CreditGqdjController.java | 6 +- .../CreditJudgmentDebtorController.java | 22 +++-- .../CreditJudicialDocumentController.java | 6 +- .../controller/CreditJudiciaryController.java | 6 +- .../controller/CreditMediationController.java | 6 +- .../CreditRiskRelationController.java | 6 +- .../controller/CreditSupplierController.java | 6 +- .../controller/CreditUserController.java | 6 +- .../controller/CreditXgxfController.java | 6 +- 19 files changed, 170 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java index 0d6b069..b027d2a 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java @@ -131,7 +131,8 @@ public class CreditBreachOfTrustController extends BaseController { @PreAuthorize("hasAuthority('credit:creditBreachOfTrust:save')") @Operation(summary = "批量导入失信被执行人") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -155,6 +156,9 @@ public class CreditBreachOfTrustController extends BaseController { try { CreditBreachOfTrust item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java index 0b29c8d..01c9147 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java @@ -135,7 +135,8 @@ public class CreditCaseFilingController extends BaseController { @PreAuthorize("hasAuthority('credit:creditCaseFiling:save')") @Operation(summary = "批量导入司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditCaseFilingController extends BaseController { try { CreditCaseFiling item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCompanyController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCompanyController.java index 316f2e9..e1a6ef3 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCompanyController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCompanyController.java @@ -135,7 +135,8 @@ public class CreditCompanyController extends BaseController { @PreAuthorize("hasAuthority('credit:creditJudiciary:save')") @Operation(summary = "批量导入企业") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java index 73565ab..dda35be 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java @@ -135,7 +135,8 @@ public class CreditCompetitorController extends BaseController { @PreAuthorize("hasAuthority('credit:creditCompetitor:save')") @Operation(summary = "批量导入竞争对手") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditCompetitorController extends BaseController { try { CreditCompetitor item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java index 771ecd3..495b061 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java @@ -135,7 +135,8 @@ public class CreditCourtAnnouncementController extends BaseController { @PreAuthorize("hasAuthority('credit:creditCourtAnnouncement:save')") @Operation(summary = "批量导入法院公告司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditCourtAnnouncementController extends BaseController { try { CreditCourtAnnouncement item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java index e63bd9a..330acb1 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java @@ -135,7 +135,8 @@ public class CreditCourtSessionController extends BaseController { @PreAuthorize("hasAuthority('credit:creditCourtSession:save')") @Operation(summary = "批量导入开庭公告司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditCourtSessionController extends BaseController { try { CreditCourtSession item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java index b042781..af86c8a 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java @@ -13,6 +13,7 @@ import com.gxwebsoft.credit.service.CreditCustomerService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.dao.DataIntegrityViolationException; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -130,7 +131,8 @@ public class CreditCustomerController extends BaseController { @PreAuthorize("hasAuthority('credit:creditCustomer:save')") @Operation(summary = "批量导入客户") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -151,9 +153,13 @@ public class CreditCustomerController extends BaseController { for (int i = 0; i < list.size(); i++) { CreditCustomerImportParam param = list.get(i); + int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows; try { CreditCustomer item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } @@ -170,31 +176,58 @@ public class CreditCustomerController extends BaseController { item.setDeleted(0); } - int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows; if (ImportHelper.isBlank(item.getName())) { errorMessages.add("第" + excelRowNumber + "行：客户不能为空"); continue; } - boolean saved = creditCustomerService.save(item); - if (!saved) { - CreditCustomer existing = creditCustomerService.lambdaQuery() - .eq(CreditCustomer::getName, item.getName()) - .one(); - if (existing != null) { - item.setId(existing.getId()); - if (creditCustomerService.updateById(item)) { + CreditCustomer existing = creditCustomerService.lambdaQuery() + .eq(CreditCustomer::getName, item.getName()) + .one(); + if (existing != null) { + Integer existingTenantId = existing.getTenantId(); + if (item.getTenantId() != null + && existingTenantId != null + && !item.getTenantId().equals(existingTenantId)) { + errorMessages.add("第" + excelRowNumber + "行：客户名称已存在且归属其他租户，无法导入"); + continue; + } + item.setId(existing.getId()); + if (existingTenantId != null) { + item.setTenantId(existingTenantId); + } + if (creditCustomerService.updateById(item)) { + successCount++; + continue; + } + } else { + try { + if (creditCustomerService.save(item)) { successCount++; continue; } + } catch (DataIntegrityViolationException e) { + if (!isDuplicateCustomerName(e)) { + throw e; + } + CreditCustomer dbExisting = creditCustomerService.lambdaQuery() + .eq(CreditCustomer::getName, item.getName()) + .one(); + if (dbExisting != null) { + Integer existingTenantId = dbExisting.getTenantId(); + item.setId(dbExisting.getId()); + if (existingTenantId != null) { + item.setTenantId(existingTenantId); + } + if (creditCustomerService.updateById(item)) { + successCount++; + continue; + } + } } - } else { - successCount++; - continue; } errorMessages.add("第" + excelRowNumber + "行：保存失败"); } catch (Exception e) { - int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows; errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage()); e.printStackTrace(); } @@ -249,14 +282,36 @@ public class CreditCustomerController extends BaseController { private CreditCustomer convertImportParamToEntity(CreditCustomerImportParam param) { CreditCustomer entity = new CreditCustomer(); - entity.setName(param.getName()); - entity.setStatusTxt(param.getStatusTxt()); - entity.setPrice(param.getPrice()); - entity.setPublicDate(param.getPublicDate()); - entity.setDataSource(param.getDataSource()); - entity.setComments(param.getComments()); + entity.setName(normalizeString(param.getName())); + entity.setStatusTxt(normalizeString(param.getStatusTxt())); + entity.setPrice(normalizeString(param.getPrice())); + entity.setPublicDate(normalizeString(param.getPublicDate())); + entity.setDataSource(normalizeString(param.getDataSource())); + entity.setComments(normalizeString(param.getComments())); return entity; } + private String normalizeString(String value) { + if (ImportHelper.isBlank(value)) { + return null; + } + return value.trim(); + } + + private boolean isDuplicateCustomerName(DataIntegrityViolationException e) { + Throwable mostSpecificCause = e.getMostSpecificCause(); + String message = mostSpecificCause != null ? mostSpecificCause.getMessage() : e.getMessage(); + if (message == null) { + return false; + } + String lower = message.toLowerCase(); + if (!lower.contains("duplicate")) { + return false; + } + return lower.contains("credit_customer.name") + || lower.contains("for key 'name'") + || lower.contains("for key `name`"); + } + } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java index 2982ff3..80f5833 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java @@ -135,7 +135,8 @@ public class CreditDeliveryNoticeController extends BaseController { @PreAuthorize("hasAuthority('credit:creditDeliveryNotice:save')") @Operation(summary = "批量导入送达公告司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditDeliveryNoticeController extends BaseController { try { CreditDeliveryNotice item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java index 070b72d..e8e7379 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java @@ -135,7 +135,8 @@ public class CreditExternalController extends BaseController { @PreAuthorize("hasAuthority('credit:creditExternal:save')") @Operation(summary = "批量导入对外投资") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditExternalController extends BaseController { try { CreditExternal item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java index 4860843..645f045 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java @@ -135,7 +135,8 @@ public class CreditFinalVersionController extends BaseController { @PreAuthorize("hasAuthority('credit:creditFinalVersion:save')") @Operation(summary = "批量导入终本案件") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditFinalVersionController extends BaseController { try { CreditFinalVersion item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java index ab40ece..60fb577 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java @@ -135,7 +135,8 @@ public class CreditGqdjController extends BaseController { @PreAuthorize("hasAuthority('credit:creditGqdj:save')") @Operation(summary = "批量导入股权冻结司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditGqdjController extends BaseController { try { CreditGqdj item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java index 56570c5..15788e4 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java @@ -145,7 +145,8 @@ public class CreditJudgmentDebtorController extends BaseController { @PreAuthorize("hasAuthority('credit:creditJudgmentDebtor:save')") @Operation(summary = "批量导入被执行人") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { try { User loginUser = getLoginUser(); Integer currentUserId = loginUser != null ? loginUser.getUserId() : null; @@ -153,9 +154,9 @@ public class CreditJudgmentDebtorController extends BaseController { ImportOutcome outcome; if (isZip(file)) { - outcome = importFromZip(file, currentUserId, currentTenantId); + outcome = importFromZip(file, currentUserId, currentTenantId, companyId); } else { - outcome = importFromExcel(file, safeFileLabel(file.getOriginalFilename()), currentUserId, currentTenantId, false); + outcome = importFromExcel(file, safeFileLabel(file.getOriginalFilename()), currentUserId, currentTenantId, companyId, false); } if (!outcome.anyDataRead) { @@ -260,7 +261,7 @@ public class CreditJudgmentDebtorController extends BaseController { } } - private ImportOutcome importFromExcel(MultipartFile excelFile, String fileLabel, Integer currentUserId, Integer currentTenantId, boolean strictDebtorSheet) throws Exception { + private ImportOutcome importFromExcel(MultipartFile excelFile, String fileLabel, Integer currentUserId, Integer currentTenantId, Integer companyId, boolean strictDebtorSheet) throws Exception { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -297,6 +298,9 @@ public class CreditJudgmentDebtorController extends BaseController { item.setUrl(link); } + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } @@ -344,15 +348,15 @@ public class CreditJudgmentDebtorController extends BaseController { return new ImportOutcome(true, successCount, errorMessages); } - private ImportOutcome importFromZip(MultipartFile zipFile, Integer currentUserId, Integer currentTenantId) throws Exception { + private ImportOutcome importFromZip(MultipartFile zipFile, Integer currentUserId, Integer currentTenantId, Integer companyId) throws Exception { try { - return importFromZip(zipFile, currentUserId, currentTenantId, StandardCharsets.UTF_8); + return importFromZip(zipFile, currentUserId, currentTenantId, companyId, StandardCharsets.UTF_8); } catch (IllegalArgumentException e) { - return importFromZip(zipFile, currentUserId, currentTenantId, Charset.forName("GBK")); + return importFromZip(zipFile, currentUserId, currentTenantId, companyId, Charset.forName("GBK")); } } - private ImportOutcome importFromZip(MultipartFile zipFile, Integer currentUserId, Integer currentTenantId, Charset charset) throws Exception { + private ImportOutcome importFromZip(MultipartFile zipFile, Integer currentUserId, Integer currentTenantId, Integer companyId, Charset charset) throws Exception { List errorMessages = new ArrayList<>(); int successCount = 0; boolean anyDataRead = false; @@ -373,7 +377,7 @@ public class CreditJudgmentDebtorController extends BaseController { MultipartFile excelFile = new InMemoryMultipartFile(entryFileName, bytes); try { - ImportOutcome outcome = importFromExcel(excelFile, entryFileName, currentUserId, currentTenantId, true); + ImportOutcome outcome = importFromExcel(excelFile, entryFileName, currentUserId, currentTenantId, companyId, true); if (outcome.anyDataRead) { anyDataRead = true; successCount += outcome.successCount; diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java index 5ed070b..3b066bc 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java @@ -135,7 +135,8 @@ public class CreditJudicialDocumentController extends BaseController { @PreAuthorize("hasAuthority('credit:creditJudicialDocument:save')") @Operation(summary = "批量导入裁判文书司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditJudicialDocumentController extends BaseController { try { CreditJudicialDocument item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java index 5903b99..2d387f4 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java @@ -134,7 +134,8 @@ public class CreditJudiciaryController extends BaseController { @PreAuthorize("hasAuthority('credit:creditJudiciary:save')") @Operation(summary = "批量导入司法案件") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -164,6 +165,9 @@ public class CreditJudiciaryController extends BaseController { CreditJudiciaryImportParam param = list.get(i); try { CreditJudiciary item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } // 设置默认值 if (item.getUserId() == null && currentUserId != null) { diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java index bd7b4e1..ad72b5d 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java @@ -135,7 +135,8 @@ public class CreditMediationController extends BaseController { @PreAuthorize("hasAuthority('credit:creditMediation:save')") @Operation(summary = "批量导入诉前调解司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditMediationController extends BaseController { try { CreditMediation item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java index 602e213..f2d86ac 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java @@ -135,7 +135,8 @@ public class CreditRiskRelationController extends BaseController { @PreAuthorize("hasAuthority('credit:creditRiskRelation:save')") @Operation(summary = "批量导入风险关系表") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -160,6 +161,9 @@ public class CreditRiskRelationController extends BaseController { try { CreditRiskRelation item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java index e3f7f10..252a225 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java @@ -135,7 +135,8 @@ public class CreditSupplierController extends BaseController { @PreAuthorize("hasAuthority('credit:creditSupplier:save')") @Operation(summary = "批量导入供应商") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditSupplierController extends BaseController { try { CreditSupplier item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); } diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java index fb17240..9730b20 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java @@ -148,7 +148,8 @@ public class CreditUserController extends BaseController { @PreAuthorize("hasAuthority('credit:creditUser:save')") @Operation(summary = "批量导入招投标信息") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -184,6 +185,9 @@ public class CreditUserController extends BaseController { if (link != null && !link.isEmpty()) { item.setUrl(link); } + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } // 设置默认值 if (item.getUserId() == null && currentUserId != null) { diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java index af15cc9..1dc913b 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java @@ -135,7 +135,8 @@ public class CreditXgxfController extends BaseController { @PreAuthorize("hasAuthority('credit:creditXgxf:save')") @Operation(summary = "批量导入限制高消费司法大数据") @PostMapping("/import") - public ApiResult> importBatch(@RequestParam("file") MultipartFile file) { + public ApiResult> importBatch(@RequestParam("file") MultipartFile file, + @RequestParam(value = "companyId", required = false) Integer companyId) { List errorMessages = new ArrayList<>(); int successCount = 0; @@ -159,6 +160,9 @@ public class CreditXgxfController extends BaseController { try { CreditXgxf item = convertImportParamToEntity(param); + if (item.getCompanyId() == null && companyId != null) { + item.setCompanyId(companyId); + } if (item.getUserId() == null && currentUserId != null) { item.setUserId(currentUserId); }