新增字段

wujianwei

2026-03-20 10309399433091888260ea31c2ab330aa57d685f

 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,15 +146,38 @@
    }

    /**
     * 导入应收费用管理数据
     * 导入应收费用管理数据（支持多Sheet：Sheet1主表，Sheet2明细表）
     */
    @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());
        // 导入主表数据（Sheet1）
        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);
    }