Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/zksy/property/service/AReceiptInfoService.java
#	src/main/java/com/zksy/property/service/ARefundService.java
#	src/main/java/com/zksy/property/service/impl/AReceiptInfoServiceImpl.java
#	src/main/java/com/zksy/property/service/impl/ARefundServiceImpl.java

src/main/java/com/zksy/controller/property/AReceiptInfoController.java

@@ -61,5 +61,25 @@ public class AReceiptInfoController {
     public AjaxResult delete(@RequestBody String[] ids) {
         return service.removeBatchByIdsWithUrl(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
+    @GetMapping("/calculateMonthlyStatistics")
+    @ApiOperation(value = "计算某年每月的收缴金额")
+    public AjaxResult calculateMonthlyStatistics(int year) {
+        return AjaxResult.success(service.calculateMonthlyStatistics(year));
+    }
+    @GetMapping("/calculateQuarterlyStatistics")
+    @ApiOperation(value = "计算某年每季度的收缴金额")
+    public AjaxResult calculateQuarterlyStatistics(int year) {
+        return AjaxResult.success(service.calculateQuarterlyStatistics(year));
+    }
+    @GetMapping("/calculateYearlyStatistics")
+    @ApiOperation(value = "计算某年的收缴金额")
+    public AjaxResult calculateYearlyStatistics() {
+        return AjaxResult.success(service.calculateYearlyStatistics());
+    }
+    @GetMapping("/getExistingYears")
+    @ApiOperation(value = "获取已存在的年份")
+    public AjaxResult getExistingYears() {
+        return AjaxResult.success(service.getExistingYears());
+    }
 
 }

src/main/java/com/zksy/controller/property/ARefundController.java

@@ -61,5 +61,25 @@ public class ARefundController {
     public AjaxResult delete(@RequestBody String[] ids) {
         return service.removeBatchByIdsWithUrl(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
+    @GetMapping("/calculateMonthlyRefundStatistics")
+    @ApiOperation(value = "退款信息月度统计")
+    public AjaxResult calculateMonthlyRefundStatistics(int year) {
+        return AjaxResult.success(service.calculateMonthlyRefundStatistics(year));
+    }
+    @GetMapping("/calculateQuarterlyRefundStatistics")
+    @ApiOperation(value = "退款信息季度统计")
+    public AjaxResult calculateQuarterlyRefundStatistics(int year) {
+        return AjaxResult.success(service.calculateQuarterlyRefundStatistics(year));
+    }
+    @GetMapping("/calculateYearlyRefundStatistics")
+    @ApiOperation(value = "退款信息年度统计")
+    public AjaxResult calculateYearlyRefundStatistics() {
+        return AjaxResult.success(service.calculateYearlyRefundStatistics());
+    }
+    @GetMapping("/getExistingRefundYears")
+    @ApiOperation(value = "退款信息查询所有年份")
+    public AjaxResult getExistingRefundYears() {
+        return AjaxResult.success(service.getExistingRefundYears());
+    }
 
 }

src/main/java/com/zksy/property/service/AReceiptInfoService.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zksy.property.domain.AReceiptInfo;
 import com.zksy.property.domain.vo.AReceiptInfoVo;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Administrator
@@ -19,4 +21,9 @@ public interface AReceiptInfoService extends IService<AReceiptInfo> {
     boolean removeBatchByIdsWithUrl(List<String> list);
 
     Page<AReceiptInfoVo> findByPageWithContract(long pageNum, long pageSize, String receiptNumber, String payer, String paymentMethod,String contractNumber);
+    Map<String, BigDecimal> calculateMonthlyStatistics(int year);
+    Map<String, BigDecimal> calculateQuarterlyStatistics(int year);
+    Map<String, BigDecimal> calculateYearlyStatistics();
+    // 获取数据库中存在的年份列表
+    List<Integer> getExistingYears();
 }

src/main/java/com/zksy/property/service/ARefundService.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zksy.property.domain.ARefund;
 import com.zksy.property.domain.vo.ARefundVo;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Administrator
@@ -19,4 +21,8 @@ public interface ARefundService extends IService<ARefund> {
     boolean removeBatchByIdsWithUrl(List<String> list);
 
     Page<ARefundVo> findByPageWithContract(long pageNum, long pageSize, String unit, String tenant, String contractNumber);
+    Map<String, BigDecimal> calculateMonthlyRefundStatistics(int year);
+    Map<String, BigDecimal> calculateQuarterlyRefundStatistics(int year);
+    Map<String, BigDecimal> calculateYearlyRefundStatistics();
+    List<Integer> getExistingRefundYears();
 }

src/main/java/com/zksy/property/service/impl/AReceiptInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.property.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.property.domain.AReceiptInfo;
@@ -14,6 +15,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
 * @author Administrator
@@ -67,6 +72,83 @@ public class AReceiptInfoServiceImpl extends ServiceImpl<AReceiptInfoMapper, ARe
         Page<AReceiptInfoVo> page = new Page<>(pageNum, pageSize);
         return areceiptInfoMapper.selectReceiptWithContractByPage(page, receiptNumber, payer, paymentMethod, contractNumber);
     }
+
+    @Override
+    public Map<String, BigDecimal> calculateMonthlyStatistics(int year) {
+        List<AReceiptInfo> receiptList = list(new QueryWrapper<AReceiptInfo>()
+                .ge("accounting_date", LocalDate.of(year, 1, 1))
+                .le("accounting_date", LocalDate.of(year, 12, 31)));
+
+        Map<String, BigDecimal> monthlyData = new LinkedHashMap<>();
+        for (int month = 1; month <= 12; month++) {
+            monthlyData.put(String.format("%d-%02d", year, month), BigDecimal.ZERO);
+        }
+
+        // 统计数据
+        for (AReceiptInfo receipt : receiptList) {
+            if (receipt.getAccountingDate() != null && receipt.getTotalAmount() != null) {
+                String monthKey = String.format("%d-%02d",
+                        year,
+                        receipt.getAccountingDate().getMonthValue()
+                );
+                monthlyData.merge(monthKey, receipt.getTotalAmount(), BigDecimal::add);
+            }
+        }
+
+        return monthlyData;
+    }
+
+    @Override
+    public Map<String, BigDecimal> calculateQuarterlyStatistics(int year) {
+        List<AReceiptInfo> receiptList = list(new QueryWrapper<AReceiptInfo>()
+                .ge("accounting_date", LocalDate.of(year, 1, 1))
+                .le("accounting_date", LocalDate.of(year, 12, 31)));
+
+        Map<String, BigDecimal> quarterlyData = new TreeMap<>();
+        for (int quarter = 1; quarter <= 4; quarter++) {
+            quarterlyData.put(year + "Q" + quarter, BigDecimal.ZERO);
+        }
+
+        for (AReceiptInfo receipt : receiptList) {
+            LocalDate date = receipt.getAccountingDate();
+            if (date != null && receipt.getTotalAmount() != null) {
+                int quarter = (date.getMonthValue() - 1) / 3 + 1;
+                String quarterKey = year + "Q" + quarter;
+                quarterlyData.merge(quarterKey, receipt.getTotalAmount(), BigDecimal::add);
+            }
+        }
+
+        return quarterlyData;
+    }
+
+    @Override
+    public Map<String, BigDecimal> calculateYearlyStatistics() {
+        List<AReceiptInfo> receiptList = list();
+        Map<String, BigDecimal> yearlyData = new TreeMap<>();
+
+        for (AReceiptInfo receipt : receiptList) {
+            LocalDate date = receipt.getAccountingDate();
+            if (date != null && receipt.getTotalAmount() != null) {
+                String yearKey = String.valueOf(date.getYear());
+                yearlyData.merge(yearKey, receipt.getTotalAmount(), BigDecimal::add);
+            }
+        }
+
+        return yearlyData;
+    }
+
+    @Override
+    public List<Integer> getExistingYears() {
+        List<AReceiptInfo> receiptList = list();
+
+        return receiptList.stream()
+                .map(AReceiptInfo::getAccountingDate)
+                .filter(Objects::nonNull)
+                .map(date -> date.getYear())
+                .distinct()
+                .sorted()
+                .collect(Collectors.toList());
+    }
 }
 
 

src/main/java/com/zksy/property/service/impl/ARefundServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zksy.property.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.property.domain.ARefund;
@@ -14,6 +15,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
 * @author Administrator
@@ -48,6 +53,85 @@ public class ARefundServiceImpl extends ServiceImpl<ARefundMapper, ARefund>
         return list;
     }
 
+    @Override
+    public Map<String, BigDecimal> calculateMonthlyRefundStatistics(int year) {
+        // 从数据库查询指定年份的所有退款记录
+        List<ARefund> refundList = list(new QueryWrapper<ARefund>()
+                .ge("generation_date", LocalDate.of(year, 1, 1))
+                .le("generation_date", LocalDate.of(year, 12, 31)));
+
+        Map<String, BigDecimal> monthlyData = new LinkedHashMap<>();
+        for (int month = 1; month <= 12; month++) {
+            monthlyData.put(String.format("%d-%02d", year, month), BigDecimal.ZERO);
+        }
+
+        for (ARefund refund : refundList) {
+            if (refund.getGenerationDate() != null && refund.getTotalAmount() != null) {
+                String monthKey = String.format("%d-%02d",
+                        year,
+                        refund.getGenerationDate().getMonthValue()
+                );
+                monthlyData.merge(monthKey, refund.getTotalAmount(), BigDecimal::add);
+            }
+        }
+
+        return monthlyData;
+    }
+
+
+    @Override
+    public Map<String, BigDecimal> calculateQuarterlyRefundStatistics(int year) {
+        List<ARefund> refundList = list(new QueryWrapper<ARefund>()
+                .ge("generation_date", LocalDate.of(year, 1, 1))
+                .le("generation_date", LocalDate.of(year, 12, 31)));
+
+        // 初始化4个季度的容器（使用LinkedHashMap保证顺序）
+        Map<String, BigDecimal> quarterlyData = new LinkedHashMap<>();
+        for (int quarter = 1; quarter <= 4; quarter++) {
+            quarterlyData.put(year + "Q" + quarter, BigDecimal.ZERO);
+        }
+
+        for (ARefund refund : refundList) {
+            LocalDate date = refund.getGenerationDate();
+            if (date != null && refund.getTotalAmount() != null) {
+                int quarter = (date.getMonthValue() - 1) / 3 + 1;
+                String quarterKey = year + "Q" + quarter;
+                quarterlyData.merge(quarterKey, refund.getTotalAmount(), BigDecimal::add);
+            }
+        }
+
+        return quarterlyData;
+    }
+
+    @Override
+    public Map<String, BigDecimal> calculateYearlyRefundStatistics() {
+        List<ARefund> refundList = list();
+        Map<String, BigDecimal> yearlyData = new TreeMap<>();
+
+        // 统计数据
+        for (ARefund refund : refundList) {
+            LocalDate date = refund.getGenerationDate();
+            if (date != null && refund.getTotalAmount() != null) {
+                String yearKey = String.valueOf(date.getYear());
+                yearlyData.merge(yearKey, refund.getTotalAmount(), BigDecimal::add);
+            }
+        }
+
+        return yearlyData;
+    }
+
+    @Override
+    public List<Integer> getExistingRefundYears() {
+        List<ARefund> refundList = list();
+        return refundList.stream()
+                .map(ARefund::getGenerationDate)
+                .filter(Objects::nonNull)
+                .map(date -> date.getYear())
+                .distinct()
+                .sorted()
+                .collect(Collectors.toList());
+    }
+
     @Autowired
     private MinioFileStorageService minioFileStorageService;