From 30f434d78b58e3a4198cf5ba5a9e5a0ce1cd5292 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 七月 2022 14:32:36 +0800
Subject: [PATCH] 'bug修复'

---
 app/ExcelUtil.cpp |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/app/ExcelUtil.cpp b/app/ExcelUtil.cpp
index 154d000..511cf1a 100644
--- a/app/ExcelUtil.cpp
+++ b/app/ExcelUtil.cpp
@@ -44,7 +44,23 @@
 
 
 
-        ws->label(index, 0, tradeData.time, xf);
+        string t = tradeData.time;
+        if (tradeData.cancelTime > 0)
+        {
+            t.append(" ").append(to_string(tradeData.cancelTime));
+            string cancelTimeUnit;
+            if (tradeData.cancelTimeUnit == TIME_SECOND) {
+                cancelTimeUnit = "s";
+            }
+            else  if (tradeData.cancelTimeUnit == TIME_MINITE) {
+                cancelTimeUnit = "m";
+            }
+            else  if (tradeData.cancelTimeUnit == TIME_HOUR) {
+                cancelTimeUnit = "h";
+            }
+            t.append(cancelTimeUnit);
+        }
+        ws->label(index, 0,t, xf);
         ws->label(index, 1, out_str.str(), xf);
         if (tradeData.limitPrice == LIMIT_PRICE_NORMAL) {
             ws->label(index, 2, L"正常价", xf);

--
Gitblit v1.8.0