web/.vs/Web/v16/.suoBinary files differ
web/App_Code/bin/Debug/App_Code.dllBinary files differ
web/App_Code/bin/Debug/App_Code.pdbBinary files differ
web/App_Code/obj/Debug/App_Code.dllBinary files differ
web/App_Code/obj/Debug/App_Code.pdbBinary files differ
web/Common/obj/Debug/Common.csproj.AssemblyReference.cacheBinary files differ
web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
@@ -58,4 +58,3 @@ D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.dll D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache web/Common/obj/Debug/Common.dllBinary files differ
web/Common/obj/Debug/Common.pdbBinary files differ
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cacheBinary files differ
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -66,10 +66,10 @@ C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache D:\Company\SMGW_NewWeb\web\Lib\Dao.dll D:\Company\SMGW_NewWeb\web\Lib\Dao.pdb D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb web/Dao/obj/Debug/Dao.dllBinary files differ
web/Dao/obj/Debug/Dao.pdbBinary files differ
web/Lib/Common.dllBinary files differ
web/Lib/Common.pdbBinary files differ
web/Lib/Dao.dllBinary files differ
web/Lib/Dao.pdbBinary files differ
web/Lib/Model.dllBinary files differ
web/Lib/Model.pdbBinary files differ
web/Model/PageBase.cs
@@ -1,5 +1,4 @@ using Common; using Common; using System; using System.Web; using System.Web.UI; web/Model/obj/Debug/Model.csproj.AssemblyReference.cacheBinary files differ
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -48,9 +48,9 @@ C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.dll C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache D:\Company\SMGW_NewWeb\web\Lib\Model.dll D:\Company\SMGW_NewWeb\web\Lib\Model.pdb D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.dll D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb web/Model/obj/Debug/Model.dllBinary files differ
web/Model/obj/Debug/Model.pdbBinary files differ
web/UMCLib/bin/Debug/UMCLib.dllBinary files differ
web/UMCLib/bin/Debug/UMCLib.pdbBinary files differ
web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cacheBinary files differ
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -50,8 +50,8 @@ D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache web/UMCLib/obj/Debug/UMCLib.dllBinary files differ
web/UMCLib/obj/Debug/UMCLib.pdbBinary files differ
web/web/Bin/App_Code.dllBinary files differ
web/web/Bin/App_Code.pdbBinary files differ
web/web/Bin/Common.dllBinary files differ
web/web/Bin/Common.pdbBinary files differ
web/web/Bin/Dao.dllBinary files differ
web/web/Bin/Dao.pdbBinary files differ
web/web/Bin/Model.dllBinary files differ
web/web/Bin/Model.pdbBinary files differ
web/web/Bin/UMCLib.pdbBinary files differ
web/web/GwSm.ashx
@@ -93,6 +93,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>"; @@ -101,7 +102,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 +158,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 +191,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 +200,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 web/web/GwSm.aspx
@@ -204,6 +204,9 @@ 补发状态 </th> <th> 耗时/秒 </th> <th> <a data-original-title="AP计费/OP计费" type="button" class="btn-xs" data-toggle="tooltip" data-placement="top" title="">计费</a> </th> web/web/GwSmResend.aspx
@@ -204,6 +204,9 @@ 补发状态 </th> <th> 耗时/秒 </th> <th> <a data-original-title="AP计费/OP计费" type="button" class="btn-xs" data-toggle="tooltip" data-placement="top" title="">计费</a> </th>