From 26b60f81d42b0aafb46cd08b88822adf2a084a44 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 15 Jan 2026 16:28:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E8=8F=9C=E5=93=81?=
 =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=BB=9F=E8=AE=A1(=E6=8C=89=E6=9C=88)?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pjcloud-common/pjcloud-common-excel/pom.xml   |   2 +-
 .../hard/api/dto/order/HardCarDto.java        |   2 +
 .../hard/api/dto/order/HardOrderDto.java      |   2 +
 .../order/HardCanteenTotalController.java     |   3 +
 .../order/HardCanteenTotalServiceImpl.java    | 118 +++++++++++++-----
 .../file/食堂菜品购买统计(按月).xlsx          | Bin 10004 -> 10774 bytes
 .../resources/mapper/order/HardCarMapper.xml  |   3 +
 .../recharge/WalletRechargeInvoiceMapper.xml  |   3 +
 8 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/pjcloud-common/pjcloud-common-excel/pom.xml b/pjcloud-common/pjcloud-common-excel/pom.xml
index 11eb9a759..35cd6c573 100644
--- a/pjcloud-common/pjcloud-common-excel/pom.xml
+++ b/pjcloud-common/pjcloud-common-excel/pom.xml
@@ -33,7 +33,7 @@
     <description>pjcloud excel 操作</description>
 
     <properties>
-        <easyexcel.version>4.0.2</easyexcel.version>
+        <easyexcel.version>4.0.3</easyexcel.version>
     </properties>
 
     <dependencies>
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
index ee90b9d10..74baae84f 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
@@ -19,6 +19,8 @@ public class HardCarDto extends HardCarEntity {
 
     private String createTimeStr;
 
+    private String createTimeYearStr;
+
     private LocalDate[] createTimeList;
 
     private List<String> orderStatusCodes;
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
index 660183834..d7cda0eff 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
@@ -36,6 +36,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private List<String> orderStatusCodes;
 
+    private String createTimeYearStr;
+
     private LocalDateTime[] createTimeList;
 
     private LocalDateTime[] payTimeList;
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java
index a1fda9eff..ab28f425a 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java
@@ -123,6 +123,9 @@ public class HardCanteenTotalController {
     @PostMapping("/proudct-total-export-by-month")
     @SysLog("食堂菜品购买统计导出(按月统计)")
     public void productTotalExportByMonth(HttpServletResponse response, @RequestBody HardOrderDto dto) {
+        if (ObjectUtil.isEmpty(dto.getCreateTimeYearStr())) {
+            throw new RuntimeException("请选择创建时间(年)");
+        }
         canteenTotalService.productTotalExportByMonth(response, dto);
     }
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java
index 63d562968..f55ab99e4 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCanteenTotalServiceImpl.java
@@ -40,6 +40,7 @@ import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -48,6 +49,7 @@ import java.math.RoundingMode;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.Month;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -281,52 +283,100 @@ public class HardCanteenTotalServiceImpl implements HardCanteenTotalService {
     @Override
     public void productTotalExportByMonth(HttpServletResponse response, HardOrderDto dto) {
         dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
-        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/食堂菜品购买统计(按月).xlsx")).build()) {
+        String createTimeYearStr = dto.getCreateTimeYearStr();
+        Integer createTimeYear = Integer.valueOf(createTimeYearStr);
+
+        // 查询食堂
+        String mchName = "所有";
+        if (ObjectUtil.isNotEmpty(dto.getMerchantId())) {
+            MchManageVo mch = remoteMchService.getById(dto.getMerchantId()).getData();
+            if (ObjectUtil.isNotEmpty(mch)) {
+                mchName = mch.getName();
+            }
+        }
+
+        // 标题
+        // 格式-2025年县府一楼食堂就餐情况统计表
+        String title = createTimeYear + "年" + mchName + "就餐情况统计表";
+
+        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/食堂菜品购买统计(按月).xlsx")).inMemory(true).build()) {
             WriteSheet writeSheet = EasyExcel.writerSheet().build();
             FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build();
 
-            long currentPage = 1L;
-            long pageSize = 200L;
-            while (true) {
-                Page<HardCanteenProductTotalVo> page = productTotalByMonth(new Page(currentPage, pageSize), dto, null);
-                if (ObjectUtil.isEmpty(page) || ObjectUtil.isEmpty(page.getRecords())) break;
-                // 填充数据
-                List<HardCanteenProductTotalVo> records = page.getRecords();
-                // 月份
-                List<Map<String, String>> mounthList = records.stream().map(v -> {
-                    LocalDateTime createTime = v.getCreateTime();
-                    String createTimeStr = LocalDateTimeUtil.format(createTime, DatePattern.NORM_MONTH_PATTERN);
-                    return Map.of("createTimeStr", createTimeStr);
-                }).toList();
-                excelWriter.fill(mounthList, fillConfig, writeSheet);
-                // 早
-                List<HardCanteenProductTotalVo> morningList = records.stream().filter(v -> ObjectUtil.equals(v.getHourType(), HardHourTypeEnum.MORNING.getType())).toList();
-                excelWriter.fill(productTotalExportByMonthToDefaulColExcelMap(morningList), fillConfig, writeSheet);
-                // 中
-                List<HardCanteenProductTotalVo> noonList = records.stream().filter(v -> ObjectUtil.equals(v.getHourType(), HardHourTypeEnum.NOONING.getType())).toList();
-                excelWriter.fill(productTotalExportByMonthToDefaulColExcelMap(noonList), fillConfig, writeSheet);
-                // 晚
-                List<HardCanteenProductTotalVo> nightList = records.stream().filter(v -> ObjectUtil.equals(v.getHourType(), HardHourTypeEnum.NIGHT.getType())).toList();
-                excelWriter.fill(productTotalExportByMonthToDefaulColExcelMap(nightList), fillConfig, writeSheet);
-                if (ObjectUtil.isEmpty(page.getPages()) || page.getCurrent() > page.getPages()) break;
-                currentPage++;
+            Map<String, Object> map = new HashMap<>();
+            map.put("title", title);
+
+            Page<HardCanteenProductTotalVo> page = productTotalByMonth(new Page(1L, 999L), dto, null);
+            List<HardCanteenProductTotalVo> records = page.getRecords();
+            // 填充数据
+            // 早
+            List<HardCanteenProductTotalVo> morningList = records.stream().filter(v -> ObjectUtil.equals(v.getHourType(), HardHourTypeEnum.MORNING.getType())).toList();
+            excelWriter.fill(productTotalExportByMonthToDefaulColExcelMap(morningList, createTimeYear, "morning"), fillConfig, writeSheet);
+            // 中
+            List<HardCanteenProductTotalVo> noonList = records.stream().filter(v -> ObjectUtil.equals(v.getHourType(), HardHourTypeEnum.NOONING.getType())).toList();
+            excelWriter.fill(productTotalExportByMonthToDefaulColExcelMap(noonList, createTimeYear, "noon"), fillConfig, writeSheet);
+            // 晚
+            List<HardCanteenProductTotalVo> nightList = records.stream().filter(v -> ObjectUtil.equals(v.getHourType(), HardHourTypeEnum.NIGHT.getType())).toList();
+            excelWriter.fill(productTotalExportByMonthToDefaulColExcelMap(nightList, createTimeYear, "night"), fillConfig, writeSheet);
+
+            excelWriter.fill(map, writeSheet);
+
+            Workbook workbook = excelWriter.writeContext().writeWorkbookHolder().getWorkbook();
+            if (ObjectUtil.isNotEmpty(workbook)) {
+                // 计算公式
+                workbook.getCreationHelper().createFormulaEvaluator().evaluateAll();
             }
-            excelWriter.fill(new HashMap<>(), writeSheet);
+            excelWriter.finish();
         } catch (Exception e) {
             e.printStackTrace();
             log.error("|食堂菜品购买统计导出(按月统计)|导出数据异常error:{}", e.getMessage());
         }
     }
 
-    private List<Map<String, String>> productTotalExportByMonthToDefaulColExcelMap(List<HardCanteenProductTotalVo> records) {
-        List<Map<String, String>> list = new LinkedList<>();
+    private List<Map<String, Object>> productTotalExportByMonthToDefaulColExcelMap(List<HardCanteenProductTotalVo> records, int year, String prefix) {
+        List<Map<String, Object>> list = new LinkedList<>();
         if (ObjectUtil.isEmpty(records)) return list;
-        for (HardCanteenProductTotalVo i : records) {
-            LinkedHashMap<String, String> map = new LinkedHashMap<>();
-            map.put("totalPrice", BigDecimal.valueOf(i.getTotalPrice()).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP).toString());
-            map.put("timeCount", String.valueOf(i.getTimeCount()));
-            list.add(map);
+        List<HardCanteenProductTotalVo> sqlList = new LinkedList<>();
+
+        List<LocalDate> monthlyRanges = new LinkedList<>();
+        for (Month month : Month.values()) {
+            LocalDate localDate = LocalDate.of(year, month.getValue(), 1);
+            monthlyRanges.add(localDate);
         }
+
+        for (LocalDate i : monthlyRanges) {
+            HardCanteenProductTotalVo target = records.stream().filter(v -> ObjectUtil.equals(v.getCreateTime().toLocalDate(), i)).findFirst().orElse(null);
+            if (ObjectUtil.isEmpty(target)) {
+                HardCanteenProductTotalVo defaultVo = new HardCanteenProductTotalVo();
+                defaultVo.setCreateTime(i.atStartOfDay());
+                defaultVo.setCreateTimeStr(LocalDateTimeUtil.format(i, DatePattern.NORM_MONTH_PATTERN));
+                sqlList.add(defaultVo);
+            } else {
+                sqlList.add(target);
+            }
+        }
+
+        double sumTotalPrice = 0;
+        long sumTimeCount = 0;
+
+        String mapKey = prefix + "Col";
+        for (HardCanteenProductTotalVo i : sqlList) {
+            double totalPrice = 0;
+            if (ObjectUtil.isNotEmpty(i.getTotalPrice())) {
+                totalPrice = BigDecimal.valueOf(i.getTotalPrice()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).doubleValue();
+            }
+            list.add(Map.of(mapKey, totalPrice));
+            sumTotalPrice += totalPrice;
+
+            long timeCount = 0;
+            if (ObjectUtil.isNotEmpty(i.getTimeCount())) {
+                timeCount = i.getTimeCount();
+            }
+            list.add(Map.of(mapKey, timeCount));
+            sumTimeCount += timeCount;
+        }
+        list.add(Map.of(mapKey, sumTotalPrice));
+        list.add(Map.of(mapKey, sumTimeCount));
         return list;
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/食堂菜品购买统计(按月).xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/食堂菜品购买统计(按月).xlsx
index b7e321ff0ffc373821b6d4cf7446bdebb5bdafc9..5abae2bacc210bf225379955101b2db2d608645d 100644
GIT binary patch
delta 6262
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
PHgcVl59f;Guk!x@q*kZh

delta 5468
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
N-*}+77i@n#{{>rgRayW5

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 030735631..2a94a7f16 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -58,6 +58,9 @@
                 </otherwise>
             </choose>
         </if>
+        <if test="dto.createTimeYearStr != null and dto.createTimeYearStr != '' ">
+            and DATE_FORMAT(a.create_time, '%Y') = #{dto.createTimeYearStr}
+        </if>
         <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
             and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
         </if>
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeInvoiceMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeInvoiceMapper.xml
index b12ec2360..72a9e4566 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeInvoiceMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeInvoiceMapper.xml
@@ -32,6 +32,9 @@
 
     <sql id="whereA">
         a.del_flag = '0'
+        <if test="dto.code != null ">
+            and a.code like concat('%', #{dto.code}, '%')
+        </if>
         <if test="dto.status != null and dto.status != '' ">
             and a.status = #{dto.status}
         </if>