From cb8dfccb7806307fac5245ad0c37a811ce48db98 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Wed, 15 Feb 2023 10:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=A3=E5=9C=A3=E8=BE=BE=E6=B3=9B=E5=BE=AEOA?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=EF=BC=8C=E8=BF=90=E8=BE=93=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=96vopbs.bstype=EF=BC=9B=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=96=87=E4=BB=B6=E5=90=8D=E6=94=B9=E4=B8=BA=E5=8F=96?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87File=5FOriginalName=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E6=89=A9=E5=B1=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs
index 66ae0127..c77172a4 100644
--- a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs
+++ b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs
@@ -1062,7 +1062,7 @@ namespace DSWeb.Areas.CommMng.DAL
                         var oldfilePath = chfeefile.File_Path.Substring(chfeefile.File_Path.IndexOf("\\Areas\\"), chfeefile.File_Path.Length - chfeefile.File_Path.IndexOf("\\Areas\\")).Replace("\\","/");
                         filePath = (paramset.PARAMVALUE + "/" + oldfilePath).Replace("//Areas", "/Areas");
                         filePath = filePath.Replace("//Areas", "/Areas");
-                        fileName = chfeefile.File_Name;
+                        fileName = chfeefile.File_OriginalName+"."+ Path.GetExtension(chfeefile.File_Name);
                     }
 
                     
@@ -1211,7 +1211,20 @@ namespace DSWeb.Areas.CommMng.DAL
                     var oplbstr = "4";
                     //4 海运进出口 5空运进出口 6铁路进口 7铁路出口
 
-                    if (oplbdic.ContainsKey(bs.OPLBNAME)) oplbstr = oplbdic[bs.OPLBNAME];
+                    var _oplbname = bs.BSTYPE;
+                    if (_oplbname == "海运进口" || _oplbname == "海运出口") {
+                        _oplbname = "海运进出口";
+                    }else
+                    if (_oplbname == "空运进口" || _oplbname == "空运出口")
+                    {
+                        _oplbname = "空运进出口";
+                    }else
+                    if (_oplbname == "铁路运输"|| _oplbname == "铁路")
+                    {
+                        _oplbname = "铁路出口";
+                    }                    
+
+                    if (oplbdic.ContainsKey(_oplbname)) oplbstr = oplbdic[_oplbname];
 
                     newline.workflowRequestTableFields.Add(new Field("yslx", oplbstr));