From 064d7cb908b5ff528dfb3310c49b2f010bd28079 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:29:23 +0800
Subject: [PATCH] 合并所有修改操作
---
web/web/GwSm.ashx | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/web/web/GwSm.ashx b/web/web/GwSm.ashx
index 832050d..8cd9c11 100644
--- a/web/web/GwSm.ashx
+++ b/web/web/GwSm.ashx
@@ -93,6 +93,15 @@
if (item.ResendStatus == 1 && item.ResendFlag == 1) { resendStatusText = "<span class='text-danger'>澶辫触鐭俊宸茶ˉ鍙�</span>"; }
if (item.ResendStatus == 1 && item.ResendFlag == 0) { resendStatusText = "<span class='text-success'>琛ュ彂璁板綍</span>"; }
str += "<td>" + resendStatusText + "</td>";
+ if (item.OpDeliverTime.ToString() == "0001/1/1 0:00:00" || item.OpDeliverTime == null)
+ {
+ str += "<td>" + "鏃犳硶璁＄畻" + "</td>";
+ }
+ else
+ {
+ str += "<td>" + (item.OpDeliverTime - item.SubmitTime).TotalSeconds + "</td>";
+ }
+
str += "<td>" + item.APFeeCount + "/" + item.OPFeeCount + "</td>";
str += "<td>" + item.APResult + "/" + item.OPResult + "</td>";
str += @"<td class=""text-right"">" + (item.SubmitTime == DateTime.MinValue ? string.Empty : item.SubmitTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
@@ -101,7 +110,7 @@
str += @"<tr>";
str += @"<td>" + item.OPMID + "</td>";
str += @"<td><span class=""label " + css + @""">" + errorMsg + "</span></td>";
- str += @"<td colspan=""8"" class=""text-right"">" + item.MsgContent + "</td>";
+ str += @"<td colspan=""9"" class=""text-right"">" + item.MsgContent + "</td>";
str += @"<td class=""text-right text-info"">" + (item.OpDeliverTime == DateTime.MinValue ? string.Empty : item.OpDeliverTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
str += "</tr>";
}
@@ -157,15 +166,17 @@
int pageSize = context.GetInt("pageSize", 20);
int pageIndex = context.GetInt("pageIndex", 1);
- List<Model.GwSm> list = dao.LoadInfoList(selectedApMID, selectedOpName, selectedClientID, selectedSpID, selectedDestnationID, selectedDate, selectedBeginTime, selectedEndTime, selectedContent, selectedOpStat, TStatus, out recordCount, pageSize, pageIndex,"ReSend");
+ List<Model.GwSm> list = dao.LoadInfoList(selectedApMID, selectedOpName, selectedClientID, selectedSpID, selectedDestnationID, selectedDate, selectedBeginTime, selectedEndTime, selectedContent, selectedOpStat, TStatus, out recordCount, pageSize, pageIndex, "ReSend");
string str = "";
if (list != null && list.Count > 0)
{
int i = 0;
+ int j = 0;
foreach (Model.GwSm item in list)
{
+
if (item.ResendStatus == 1 && item.ResendFlag == 0)
{
i++;
@@ -188,6 +199,7 @@
if (item.ResendStatus == 1 && item.ResendFlag == 1) { resendStatusText = "<span class='text-danger'>澶辫触鐭俊宸茶ˉ鍙�</span>"; }
if (item.ResendStatus == 1 && item.ResendFlag == 0) { resendStatusText = "<span class='text-success'>琛ュ彂璁板綍</span>"; }
str += "<td>" + resendStatusText + "</td>";
+ str += "<td>" + (item.OpDeliverTime - item.SubmitTime).TotalSeconds + "</td>";
str += "<td>" + item.APFeeCount + "/" + item.OPFeeCount + "</td>";
str += "<td>" + item.APResult + "/" + item.OPResult + "</td>";
str += @"<td class=""text-right"">" + (item.SubmitTime == DateTime.MinValue ? string.Empty : item.SubmitTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
@@ -196,10 +208,13 @@
str += @"<tr>";
str += @"<td>" + item.OPMID + "</td>";
str += @"<td><span class=""label " + css + @""">" + errorMsg + "</span></td>";
- str += @"<td colspan=""8"" class=""text-right"">" + item.MsgContent + "</td>";
+ str += @"<td colspan=""9"" class=""text-right"">" + item.MsgContent + "</td>";
str += @"<td class=""text-right text-info"">" + (item.OpDeliverTime == DateTime.MinValue ? string.Empty : item.OpDeliverTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
str += "</tr>";
- }
+ }//琛ュ彂鐘舵�佹樉绀�
+
+
+
}
}
else
--
Gitblit v1.9.1