From 35a5eec0d176b550fb0d7c5a0a5421b66f3b26c4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 11 二月 2023 11:36:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/sys/ReportService.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index 61e75fa..63c40b0 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -2,6 +2,7 @@
 
 import com.lf.server.entity.ctrl.CountEntity;
 import com.lf.server.entity.sys.ReportEntity;
+import com.lf.server.helper.FileHelper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WordHelper;
 import com.lf.server.mapper.sys.ReportMapper;
@@ -92,7 +93,7 @@
     /**
      * 鍒涘缓 鐢ㄦ埛娴侀噺缁熻 Word
      */
-    public void createCountSizesWord() {
+    public void createCountOperatesWord() {
         List<CountEntity> list = countOperates();
         if (null == list || list.isEmpty()) {
             return;
@@ -134,21 +135,21 @@
     }
 
     /**
-     * 鍒涘缓 鐢ㄦ埛娴侀噺缁熻 Word
+     * 鍒涘缓 鏁版嵁閲忕粺璁� Word
      */
-    public void createCountOperatesWord() {
-        List<CountEntity> list = countOperates();
+    public void createCountSizesWord() {
+        List<CountEntity> list = countSizes();
         if (null == list || list.isEmpty()) {
             return;
         }
 
         int rows = 1;
-        String inputFile = "D:\\LF\\鏈嶅姟璋冪敤閲忕粺璁�.docx";
-        String outPutFile = "D:\\LF\\鏈嶅姟璋冪敤閲忕粺璁new.docx";
+        String inputFile = "D:\\LF\\鏁版嵁閲忕粺璁�.docx";
+        String outPutFile = "D:\\LF\\鏁版嵁閲忕粺璁new.docx";
 
         ArrayList<String[]> addList = new ArrayList<>();
         for (CountEntity ce : list) {
-            String[] strs = new String[]{"" + rows++, ce.getM1(), ce.getCount().toString()};
+            String[] strs = new String[]{"" + rows++, ce.getM1(), FileHelper.getSizes(ce.getSizes())};
             addList.add(strs);
         }
 

--
Gitblit v1.9.3