Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

sen

2025-12-22 08b030a4cb662725c4f73e3b8a531de2c593369b

 service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java

@@ -17,7 +17,9 @@

import com.ruoyi.cwgl.mapper.PayableFeeManagementMapper;
import com.ruoyi.cwgl.domain.PayableFeeManagement;
import com.ruoyi.cwgl.domain.PayableFeeDetail;
import com.ruoyi.cwgl.service.IPayableFeeManagementService;
import com.ruoyi.cwgl.service.IPayableFeeDetailService;
import com.ruoyi.common.core.text.Convert;

/**
@@ -34,6 +36,9 @@
    @Resource
    private PayableFeeManagementMapper payableFeeManagementMapper;

    @Resource
    private IPayableFeeDetailService payableFeeDetailService;


    /**
     * 查询应付费用管理
@@ -45,7 +50,15 @@
    @Override
    public PayableFeeManagement selectPayableFeeManagementById(Integer id)
    {
        return payableFeeManagementMapper.selectPayableFeeManagementById(id);
        PayableFeeManagement payableFeeManagement = payableFeeManagementMapper.selectPayableFeeManagementById(id);
        if (payableFeeManagement != null) {
            // 查询对应的费用明细
            PayableFeeDetail detail = new PayableFeeDetail();
            detail.setPayableFeeId(id);
            List<PayableFeeDetail> detailList = payableFeeDetailService.selectPayableFeeDetailList(detail);
            payableFeeManagement.setPayableFeeDetailList(detailList);
        }
        return payableFeeManagement;
    }

    /**
@@ -103,7 +116,21 @@
    public int insertPayableFeeManagement(PayableFeeManagement payableFeeManagement)
    {
        payableFeeManagement.setCreateTime(DateUtils.getNowDate());
        return payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
        
        // 保存主实体
        int result = payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
        Integer payableFeeId = payableFeeManagement.getId();
        
        // 批量保存明细
        if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
            payableFeeManagement.getPayableFeeDetailList().forEach(detail -> {
                detail.setPayableFeeId(payableFeeId);
                detail.setCreateTime(DateUtils.getNowDate());
            });
            payableFeeDetailService.insertPayableFeeDetailBatch(payableFeeManagement.getPayableFeeDetailList());
        }
        
        return result;
    }

    /**
@@ -180,3 +207,5 @@
        return payableFeeManagementMapper.deletePayableFeeManagementById(id);
    }
}