From 6df8411e720cfef1b474f178825bdee32ef71a59 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 20 三月 2026 15:06:35 +0800
Subject: [PATCH] 新增回馈进度表

---
 service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java |   94 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java
index 139d6e5..7fe2305 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableBillManagementServiceImpl.java
@@ -1,11 +1,18 @@
 package com.ruoyi.cwgl.service.impl;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
 import javax.annotation.Resource;
+
+import com.ruoyi.cwgl.domain.ReceivableBillCustomerSummary;
+import com.ruoyi.cwgl.domain.vo.ReceivableBillAgingAnalysisVo;
+import com.ruoyi.cwgl.mapper.ReceivableFeeManagementMapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,10 +25,13 @@
 import com.ruoyi.cwgl.mapper.ReceivableBillManagementMapper;
 import com.ruoyi.cwgl.domain.ReceivableBillManagement;
 import com.ruoyi.cwgl.domain.ReceivableFeeManagement;
+import com.ruoyi.cwgl.domain.ReceivableBillManagementLog;
+import com.ruoyi.cwgl.service.IReceivableBillManagementLogService;
 import com.ruoyi.cwgl.service.IReceivableBillManagementService;
 import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 
 /**
  * 搴旀敹璐﹀崟绠$悊Service涓氬姟灞傚鐞�
@@ -36,9 +46,11 @@
     protected final Logger logger = LoggerFactory.getLogger(getClass());
     @Resource
     private ReceivableBillManagementMapper receivableBillManagementMapper;
+    @Resource
+    private ReceivableFeeManagementMapper receivableFeeManagementMapper;
     
     @Resource
-    private IReceivableFeeManagementService receivableFeeManagementService;
+    private IReceivableBillManagementLogService receivableBillManagementLogService;
 
 
     /**
@@ -135,7 +147,19 @@
     public int updateReceivableBillManagement(ReceivableBillManagement receivableBillManagement)
     {
         receivableBillManagement.setUpdateTime(DateUtils.getNowDate());
-        return receivableBillManagementMapper.updateReceivableBillManagement(receivableBillManagement);
+        int result = receivableBillManagementMapper.updateReceivableBillManagement(receivableBillManagement);
+        
+        // 璁板綍鎿嶄綔鏃ュ織
+        if (result > 0) {
+            ReceivableBillManagementLog log = new ReceivableBillManagementLog();
+            log.setBillId(receivableBillManagement.getId());
+            log.setCreateBy(SecurityUtils.getUsername());
+            log.setCreateTime(DateUtils.getNowDate());
+            log.setOperation("淇敼搴旀敹璐﹀崟锛岃处鍗曠紪鍙凤細" + receivableBillManagement.getSystemNo());
+            receivableBillManagementLogService.insertReceivableBillManagementLog(log);
+        }
+        
+        return result;
     }
 
     /**
@@ -220,13 +244,75 @@
                 // 鏌ヨ鍏宠仈璇ヨ处鍗曠殑搴旀敹璐圭敤璁板綍
                 ReceivableFeeManagement queryFee = new ReceivableFeeManagement();
                 queryFee.setRelatedBillNo(billSystemNo);
-                List<ReceivableFeeManagement> feeList = receivableFeeManagementService.selectReceivableFeeManagementList(queryFee);
+                List<ReceivableFeeManagement> feeList = receivableFeeManagementMapper.selectReceivableFeeManagementList(queryFee);
                 
                 // 娓呴櫎鍏宠仈璐﹀崟缂栧彿骞跺皢鐘舵�佹敼涓�0锛堝緟鐢熸垚璐﹀崟锛�
-                receivableFeeManagementService.updateReceivableFeeManagementByRelatedBillNo(billSystemNo);
+                receivableFeeManagementMapper.updateReceivableFeeManagementByRelatedBillNo(billSystemNo);
             }
+            
+            // 璁板綍浣滃簾鎿嶄綔鏃ュ織
+            ReceivableBillManagementLog log = new ReceivableBillManagementLog();
+            log.setBillId(id);
+            log.setCreateBy(SecurityUtils.getUsername());
+            log.setCreateTime(DateUtils.getNowDate());
+            log.setOperation("浣滃簾搴旀敹璐﹀崟锛岃处鍗曠紪鍙凤細" + billManagement.getSystemNo());
+            receivableBillManagementLogService.insertReceivableBillManagementLog(log);
         }
         
         return result;
     }
+    
+    /**
+     * 鏍规嵁绯荤粺缂栧彿鏌ヨ搴旀敹璐﹀崟绠$悊
+     * 
+     * @param systemNo 绯荤粺缂栧彿
+     * @return 搴旀敹璐﹀崟绠$悊
+     */
+    @DataSource(DataSourceType.SLAVE)
+    @Override
+    public ReceivableBillManagement selectReceivableBillManagementBySystemNo(String systemNo)
+    {
+        return receivableBillManagementMapper.selectReceivableBillManagementBySystemNo(systemNo);
+    }
+    
+    /**
+     * 鏌ヨ搴旀敹璐﹀崟瀹㈡埛姹囨�诲垪琛�
+     *
+     * @param receivableBillManagement 鏌ヨ鏉′欢
+     * @return 搴旀敹璐﹀崟瀹㈡埛姹囨�诲垪琛�
+     */
+    @DataSource(DataSourceType.SLAVE)
+    @Override
+    public List<ReceivableBillCustomerSummary> selectReceivableBillCustomerSummaryList(ReceivableBillManagement receivableBillManagement)
+    {
+        return receivableBillManagementMapper.selectReceivableBillCustomerSummaryList(receivableBillManagement);
+    }
+
+    /**
+     * 鏌ヨ搴旀敹璐﹀崟璐﹂緞鍒嗘瀽鍒楄〃
+     *
+     * @param receivableBillManagement 鏌ヨ鏉′欢
+     * @return 搴旀敹璐﹀崟璐﹂緞鍒嗘瀽鍒楄〃
+     */
+    @DataSource(DataSourceType.SLAVE)
+    @Override
+    public List<ReceivableBillAgingAnalysisVo> selectReceivableBillAgingAnalysisList(ReceivableBillManagement receivableBillManagement)
+    {
+        // 鐩存帴鏌ヨ鏁版嵁搴撲腑鐨勯璁$畻璐﹂緞鏁版嵁
+        List<ReceivableBillAgingAnalysisVo> result = receivableBillManagementMapper.selectReceivableBillAgingAnalysisList(receivableBillManagement);
+        
+        return result;
+    }
+
+    /**
+     * 鎵归噺鏇存柊搴旀敹璐﹀崟璐﹂緞鍒嗘瀽鏁版嵁
+     * 鐩存帴鍦ㄦ暟鎹簱灞傞潰璁$畻璐﹂緞鍒嗘锛岄伩鍏嶆煡璇㈠ぇ閲忔暟鎹埌搴旂敤灞�
+     *
+     * @return 鏇存柊鐨勮褰曟暟
+     */
+    @Override
+    public int batchUpdateAgingAnalysisData()
+    {
+        return receivableBillManagementMapper.batchUpdateAgingAnalysisData();
+    }
 }

--
Gitblit v1.8.0