From b4a8bf3a54b62ec61895e55b457d92d7fa10cc7e Mon Sep 17 00:00:00 2001
From: lk <1837241092@qq.com>
Date: 星期日, 30 十月 2022 19:12:35 +0800
Subject: [PATCH] 已解决数据不匹配问题20221030LK

---
 Libs/MojoCube.Api/File/WordHelper.cs |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Libs/MojoCube.Api/File/WordHelper.cs b/Libs/MojoCube.Api/File/WordHelper.cs
index 14cc48b..7385143 100644
--- a/Libs/MojoCube.Api/File/WordHelper.cs
+++ b/Libs/MojoCube.Api/File/WordHelper.cs
@@ -59,11 +59,12 @@
         }
 
 
-        public void GenerateInfos(System.Data.DataTable dt, string bookMark, ref WordHelper wordHelper)
+        public void GenerateInfos(System.Data.DataTable dt, ArrayList bookMark, ref WordHelper wordHelper)
         {
 
             string[] Titles = new string[dt.Columns.Count];
-
+            string[] arrs = (string[])bookMark.ToArray(typeof(string));
+            int count = arrs.Length - 1;
             string strInfos = "";
             for (int i = 0; i < dt.Rows.Count; i++)
             {
@@ -76,23 +77,26 @@
                         for (int m = 0; m < strImgs.Length; m++)
                         {
                             strInfos += "bookMark" + i + j + m;
+                            strInfos += "\r\n";
                         }
-                        //strInfos += "\r\n";
+
                     }
                     else
                     {
                         //strInfos += Titles[j] == "" ? dt.Rows[i][j].ToString() + "\r\n" : Titles[j] + ":\r\n" + dt.Rows[i][j].ToString() + "\r\n";
                     }
+                    if (strInfos != "" && j == 3)
+                    {
+                        wordHelper.InsertText(arrs[count], strInfos);
+                        count--;
+                        strInfos = "";
+                    }
                 }
-                strInfos += "\r\n";
             }
-            //string[] arrs = (string[])bookMark.ToArray(typeof(string));
-            //for (int i = 0; i < bookMark.Count; i++)
-            //{
-            //    wordHelper.InsertText(arrs[i], strInfos);
-            //}
 
-            wordHelper.InsertText(bookMark, strInfos);
+
+            //wordHelper.InsertText(bookMark, strInfos);
+
 
             //鎻掑叆鍥剧墖
             int iNo = 1;
@@ -118,7 +122,6 @@
                                 rangeTmp.Select();
                                 wordApp.Selection.Delete();
                             }
-
                         }
                     }
                 }

--
Gitblit v1.8.0