From 0b76c560a27c89df168271d7210ab6bf9de28f7d Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 05 一月 2026 16:55:50 +0800
Subject: [PATCH] 新增字段
---
service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
index 52266a9..3ed912c 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
@@ -1,6 +1,9 @@
package com.ruoyi.cwgl.controller;
+import java.util.ArrayList;
import java.util.List;
+
+import com.ruoyi.cwgl.domain.ReceivableFeeDetail;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -143,16 +146,39 @@
}
/**
- * 瀵煎叆搴旀敹璐圭敤绠＄悊鏁版嵁
+ * 瀵煎叆搴旀敹璐圭敤绠＄悊鏁版嵁锛堟敮鎸佸Sheet锛歋heet1涓昏〃锛孲heet2鏄庣粏琛級
*/
@Log(title = "搴旀敹璐圭敤绠＄悊", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagement:import')")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
- ExcelUtil<ReceivableFeeManagement> util = new ExcelUtil<ReceivableFeeManagement>(ReceivableFeeManagement.class);
- List<ReceivableFeeManagement> receivableFeeList = util.importExcel(file.getInputStream());
- String message = receivableFeeManagementService.importReceivableFee(receivableFeeList, updateSupport, getUsername());
+ // 瀵煎叆涓昏〃鏁版嵁锛圫heet1锛�
+ ExcelUtil<ReceivableFeeManagement> mainUtil = new ExcelUtil<ReceivableFeeManagement>(ReceivableFeeManagement.class);
+ List<ReceivableFeeManagement> receivableFeeList = mainUtil.importExcel("搴旀敹璐圭敤涓昏〃", file.getInputStream(),10000);
+
+ // 瀵煎叆鏄庣粏琛ㄦ暟鎹紙Sheet2锛夊苟鍏宠仈鍒颁富琛�
+ ExcelUtil<ReceivableFeeDetail> detailUtil = new ExcelUtil<ReceivableFeeDetail>(ReceivableFeeDetail.class);
+ List<ReceivableFeeDetail> detailList = detailUtil.importExcel("搴旀敹璐圭敤鏄庣粏", file.getInputStream(),10000);
+
+ // 灏嗘槑缁嗘暟鎹叧鑱斿埌瀵瑰簲鐨勪富琛ㄨ褰�
+ if (detailList != null && !detailList.isEmpty()) {
+ for (ReceivableFeeDetail detail : detailList) {
+ // 鏍规嵁搴忓彿瀛楁鎵惧埌瀵瑰簲鐨勪富琛ㄨ褰�
+ for (ReceivableFeeManagement mainRecord : receivableFeeList) {
+ if (mainRecord.getSerialNumber() != null &&
+ mainRecord.getSerialNumber().equals(detail.getSerialNumber())) {
+ if (mainRecord.getReceivableFeeDetailList() == null) {
+ mainRecord.setReceivableFeeDetailList(new ArrayList<>());
+ }
+ mainRecord.getReceivableFeeDetailList().add(detail);
+ break;
+ }
+ }
+ }
+ }
+
+ String message = receivableFeeManagementService.importReceivableFee(receivableFeeList, getUsername());
return success(message);
}
--
Gitblit v1.8.0