Browse Source

1.部分OCR接口下载
2.收款账单调整其他费用合计

leiy 9 months ago
parent
commit
b0598673d9

+ 43 - 7
OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -912,7 +912,7 @@ namespace OASystem.API.Controllers
                     if (doc.Range.Bookmarks["Team"] != null)
                     {
                         Bookmark mark = doc.Range.Bookmarks["Team"];
-                        mark.Text = _DelegationInfo.VisitCountry == null ? "" : _DelegationInfo.VisitCountry.ToString();
+                        mark.Text = _DelegationInfo.VisitCountry == null ? "" : _DelegationInfo.VisitCountry.Replace("|","、").ToString();
                     }
 
                     //付款日期
@@ -946,7 +946,8 @@ namespace OASystem.API.Controllers
 
                     //文件名
                     string strFileName = _DelegationInfo.TeamName + "-收款账单.docx";
-
+                    //去水印
+                    new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
                     doc.Save(AppSettingsHelper.Get("WordBasePath") + "ForeignReceivables/File/" + strFileName);
                     string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/ForeignReceivables/File/" + strFileName;
 
@@ -976,7 +977,6 @@ namespace OASystem.API.Controllers
                         }
                     }
 
-
                     //数据源
                     List<Grp_DayAndCost> dac1 = _DayAndCosts.Where(it => it.Type == 1).ToList(); //住宿费
                     List<Grp_DayAndCost> dac2 = _DayAndCosts.Where(it => it.Type == 2).ToList(); //伙食费
@@ -1029,7 +1029,7 @@ namespace OASystem.API.Controllers
                         bookmarkArr.Add("ClientUnit", ClientItem.Key); //单位
                         bookmarkArr.Add("VisitStartDate", _DelegationInfo.VisitStartDate.ToString("yyyy年MM月dd日"));//出发日期
                         bookmarkArr.Add("name", string.Join(",", ClientItem.Select(x => x.Name).ToArray()).TrimEnd(','));//全部人员信息
-                        bookmarkArr.Add("VisitCountry", _DelegationInfo.VisitCountry);//出访国家
+                        bookmarkArr.Add("VisitCountry", _DelegationInfo.VisitCountry.Replace("|","、"));//出访国家
                         bookmarkArr.Add("dayTime", DateTime.Now.ToString("yyyy年MM月dd日"));//今天日期
 
                         var ClientItemList = ClientItem.ToList();
@@ -1050,7 +1050,7 @@ namespace OASystem.API.Controllers
                             decimal airPrice = client.AirType == 460 ? _EnterExitCosts.AirJJ : _EnterExitCosts.AirGW;
                             decimal AllPrice = airPrice + _EnterExitCosts.CityTranffic + dac1.Sum(x => x.SubTotal) + dac2.Sum(x => x.SubTotal) +
                                                dac3.Sum(x => x.SubTotal) + dac4.Sum(x => x.SubTotal) + _EnterExitCosts.Visa + _EnterExitCosts.Safe +
-                                               _EnterExitCosts.Service;
+                                               +_EnterExitCosts.YiMiao + _EnterExitCosts.YiMiao + _EnterExitCosts.Ticket + _EnterExitCosts.Service;
                             WordAllPrice += AllPrice;
 
                             UsersTop += firstName + "出访费用为¥" + AllPrice.ToString("#0.00") + "元、";
@@ -1184,8 +1184,42 @@ namespace OASystem.API.Controllers
                             TeableBookmarkArr.Add("hsinfo", hsinfo); //伙食费详情
                             TeableBookmarkArr.Add("gz", dac3.Sum(x => Convert.ToDecimal(x.SubTotal)).ToString("#0.00") + " 元"); //公杂费
                             TeableBookmarkArr.Add("gzinfo", gzinfo); //公杂费详情
-                            TeableBookmarkArr.Add("qt", (_EnterExitCosts.Visa + _EnterExitCosts.Safe).ToString("#0.00") + " 元");//其他费用
-                            TeableBookmarkArr.Add("qtinfo", $"(签证费{_EnterExitCosts.Visa.ToString("#0.00")}元、保险{_EnterExitCosts.Safe.ToString("#0.00")}元等费用)");//其他费用第二列
+
+                            string otherFeestr = "";
+                            decimal otherFee = 0.00M;
+                            if (_EnterExitCosts.Visa > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.Visa;
+                                otherFeestr += $"签证费{_EnterExitCosts.Visa.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.YiMiao > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.YiMiao;
+                                otherFeestr += $"疫苗费{_EnterExitCosts.YiMiao.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.HeSuan > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.HeSuan;
+                                otherFeestr += $"核酸检测费{_EnterExitCosts.HeSuan.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.Safe > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.Safe;
+                                otherFeestr += $"保险费{_EnterExitCosts.Safe.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.Ticket > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.Ticket;
+                                otherFeestr += $"参展门票费{_EnterExitCosts.Ticket.ToString("#0.00")}元、";
+                            }
+                            if (otherFeestr.Length > 0) {
+                                otherFeestr = otherFeestr.Substring(0, otherFeestr.Length - 1);
+                                otherFeestr += "等费用";
+                            }
+
+                            TeableBookmarkArr.Add("qt", otherFee.ToString("#0.00") + " 元");//其他费用
+                            TeableBookmarkArr.Add("qtinfo", otherFeestr);//其他费用第二列
+
                             TeableBookmarkArr.Add("fw", _EnterExitCosts.Service.ToString("#0.00") + "元/人");//服务费
                             TeableBookmarkArr.Add("AllPrice", AllPrice.ToString("#0.00") + "元/人");//表格合计费用
                             string airStr = client.AirType == 460 ? "经济舱" : client.AirType == 458 ? "公务舱" : "";
@@ -1227,6 +1261,8 @@ namespace OASystem.API.Controllers
                         }
                         //MemoryStream outSteam = new MemoryStream();
                         string filsPath = AppSettingsHelper.Get("WordBasePath") + $"ForeignReceivables/File/{ClientItem.Key.Replace("\n", "")}.docx";
+                        //去水印
+                        new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
                         doc.Save(filsPath);
                         filesToZip.Add(filsPath);
                         //streams.Add(ClientItem.Key + ".docx", outSteam.ToArray());

+ 205 - 21
OASystem/OASystem.Api/Controllers/TencentOCRController.cs

@@ -1,5 +1,6 @@
 using Aspose.Cells;
 using Aspose.Words;
+using Aspose.Words.Fonts;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using NPOI.HPSF;
 using OASystem.API.OAMethodLib.File;
@@ -10,6 +11,7 @@ using OASystem.Domain.Dtos.CRM;
 using OASystem.Domain.Dtos.QiYeWeChat;
 using OASystem.Domain.Dtos.Tencent;
 using OASystem.Domain.ViewModels.OCR;
+using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Domain.ViewModels.TencentOCR;
 using OASystem.Infrastructure.Repositories.CRM;
 using Org.BouncyCastle.Crypto;
@@ -211,7 +213,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 户口簿识别
-        ///  文档下载 
+        ///  文档下载 ?
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -261,8 +263,6 @@ namespace OASystem.API.Controllers
                 content += $"成立日期:{res.SetDate}\r\n\r\n";
             }
 
-            
-
             builder.Write(content);
 
             string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
@@ -276,14 +276,17 @@ namespace OASystem.API.Controllers
 
             doc.Save(outputPath);
 
+            string url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
 
 
-            return $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
-
+            var data = new { 
+                dataSource = residenceBookData.Data,
+                url = url
+            };
             #endregion
 
 
-            return Ok(JsonView(residenceBookData.Data));
+            return Ok(JsonView(data));
         }
 
         /// <summary>
@@ -351,7 +354,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 行驶证识别
-        /// 获取行驶证返回数据 
+        /// 文档下载 
         /// CardSide=0 主页正面(有红色印章的一面),CardSide=1 行驶证副页正面(有号码号牌的一面),CardSide=2 行驶证主页正面和副页正面。
         /// </summary>
         /// <param name="dto"></param>
@@ -366,24 +369,121 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var vehicleLicenseData = await TencentOCRTools.GetOCR((int)TencentOCREnum.VehicleLicense, dto);
+            var vehicleLicenseData = TencentOCRTools.GetOCR((int)TencentOCREnum.VehicleLicense, dto);
 
-            if (vehicleLicenseData.Code != 0)
+            if (vehicleLicenseData.Result.Code != 0)
             {
-                return Ok(JsonView(vehicleLicenseData.Msg));
+                return Ok(JsonView(vehicleLicenseData.Result.Msg));
             }
 
-            if (vehicleLicenseData.Data == null)
+            if (vehicleLicenseData.Result.Data == null)
             {
-                return Ok(JsonView(vehicleLicenseData.Msg));
+                return Ok(JsonView(vehicleLicenseData.Result.Msg));
             }
 
-            return Ok(JsonView(vehicleLicenseData.Data));
+
+            #region word下载
+
+            VehicleLicenseOCRResponse vlData = vehicleLicenseData.Result.Data as VehicleLicenseOCRResponse;
+
+            string url = ""; 
+            string fileName = "";
+            string content = "";
+            dynamic data = null;
+
+            try
+            {
+                //Aspose.Words.License lic = new Aspose.Words.License();
+                //lic.SetLicense("Aspose.Wrods.lic");//破解版不用设置license
+
+                if (dto.CardSide == 0) // 正面
+                {
+                    fileName = "行驶证识别-主页";
+                    content = $"{fileName}\r\n\r\n";
+                    TextVehicleFront frontInfo = vlData.FrontInfo;
+                    Document doc = new Document();
+                    DocumentBuilder builder = new DocumentBuilder(doc);
+                    if (frontInfo != null)
+                    {
+                        data = frontInfo;
+                        content += $"号牌号码:{frontInfo.PlateNo ?? "Unknown"}\r\n\r\n";
+                        content += $"车辆类型:{frontInfo.VehicleType ?? "Unknown"}\r\n\r\n";
+                        content += $"所有人:{frontInfo.Owner ?? "Unknown"}\r\n\r\n";
+                        content += $"住址:{frontInfo.Address ?? "Unknown"}\r\n\r\n";
+                        content += $"使用性质:{frontInfo.UseCharacter ?? "Unknown"}\r\n\r\n";
+                        content += $"品牌型号:{frontInfo.Model ?? "Unknown"}\r\n\r\n";
+                        content += $"车辆识别代号:{frontInfo.Vin ?? "Unknown"}\r\n\r\n";
+                        content += $"发动机号码:{frontInfo.EngineNo ?? "Unknown"}\r\n\r\n";
+                        content += $"注册日期:{frontInfo.RegisterDate ?? "Unknown"}\r\n\r\n";
+                        content += $"发证日期:{frontInfo.IssueDate ?? "Unknown"}\r\n\r\n";
+                        content += $"印章:{frontInfo.Seal ?? "Unknown"}\r\n\r\n";
+                    }
+                    builder.Write(content);
+
+                    string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+                    string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+                    string outputPath = Path.Combine(outputDir, outputFile);
+
+                    if (!Directory.Exists(outputDir))
+                    {
+                        Directory.CreateDirectory(outputDir);
+                    }
+                    //去水印
+                    new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
+                    doc.Save(outputPath);
+                    url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+                }
+                else if (dto.CardSide == 1) //反面
+                {
+                    TextVehicleBack backInfo = vlData.BackInfo;
+                    fileName = "行驶证识别-副页";
+                    content = $"{fileName}\r\n\r\n";
+                    Document doc = new Document();
+                    DocumentBuilder builder = new DocumentBuilder(doc);
+                    if (backInfo != null)
+                    {
+                        data = backInfo;
+                        content += $"号牌号码:{backInfo.PlateNo ?? "Unknown"}\r\n\r\n";
+                        content += $"档案编号:{backInfo.FileNo ?? "Unknown"}\r\n\r\n";
+                        content += $"核定人数:{backInfo.AllowNum ?? "Unknown"}\r\n\r\n";
+                        content += $"总质量:{backInfo.TotalMass ?? "Unknown"}\r\n\r\n";
+                        content += $"整备质量:{backInfo.CurbWeight ?? "Unknown"}\r\n\r\n";
+                        content += $"核定载质量:{backInfo.LoadQuality ?? "Unknown"}\r\n\r\n";
+                        content += $"外廓尺寸:{backInfo.ExternalSize ?? "Unknown"}\r\n\r\n";
+                        content += $"备注:{backInfo.Marks ?? "Unknown"}\r\n\r\n";
+                        content += $"检验记录:{backInfo.Record ?? "Unknown"}\r\n\r\n";
+                        content += $"准牵引总质量:{backInfo.TotalQuasiMass ?? "Unknown"}\r\n\r\n";
+                    }
+                    builder.Write(content);
+
+                    string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+                    string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+                    string outputPath = Path.Combine(outputDir, outputFile);
+
+                    if (!Directory.Exists(outputDir))
+                    {
+                        Directory.CreateDirectory(outputDir);
+                    }
+
+                    doc.Save(outputPath);
+                    url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+                }
+
+                #endregion
+
+                return Ok(JsonView(true, "操作成功", new { dataSource = data, url = url }));
+            }
+            catch (Exception ex)
+            {
+
+                return Ok(JsonView(false, $"InnerException:{ex.InnerException?.Message ?? "Unknown"} ErrMsg:{ex.Message}"));
+            }
+            
         }
 
         /// <summary>
-        /// 房产证识别
-        /// 获取房产证返回数据 
+        /// 房产证识别(腾讯OCR 未找到)
+        /// 返回数据 
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -413,8 +513,8 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 结婚证识别
-        /// 获取结婚证返回数据 
+        /// 结婚证识别(腾讯OCR 未找到)
+        /// 返回数据 
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -444,8 +544,8 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 统一信用代码识别 
-        /// 获取统一信用代码返回数据 
+        /// 统一信用代码识别 (腾讯OCR 未找到)
+        /// 返回数据 
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -502,7 +602,49 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(pData.Msg));
             }
 
-            return Ok(JsonView(pData.Data));
+            string url = "";
+            #region 文档下载
+
+            string fileName = "护照识别(中国大陆地区护照)";
+            string content = $"{fileName}\r\n\r\n";
+            PassportOCRResponse pInfo = pData.Data as PassportOCRResponse;
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+            if (pInfo != null)
+            {
+                content += $"国家码:{pInfo.Country ?? "Unknown"}\r\n\r\n";
+                content += $"护照号:{pInfo.PassportNo ?? "Unknown"}\r\n\r\n";
+                content += $"性别:{pInfo.Sex ?? "Unknown"}\r\n\r\n";
+                content += $"国籍:{pInfo.Nationality ?? "Unknown"}\r\n\r\n";
+                content += $"出生日期:{pInfo.BirthDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发日期:{pInfo.IssueDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发地点:{pInfo.IssuePlace ?? "Unknown"}\r\n\r\n";
+                content += $"有效期:{pInfo.ExpiryDate ?? "Unknown"}\r\n\r\n";
+                content += $"持证人签名:{pInfo.Signature ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第一行 MRZ Code 序列:{pInfo.CodeSet ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第二行 MRZ Code 序列:{pInfo.CodeCrc ?? "Unknown"}\r\n\r\n";
+                content += $"姓名:{pInfo.Name ?? "Unknown"}\r\n\r\n";
+                content += $"姓:{pInfo.FamilyName ?? "Unknown"}\r\n\r\n";
+                content += $"名:{pInfo.FirstName ?? "Unknown"}\r\n\r\n";
+            }
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+            //去水印
+            new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
+            doc.Save(outputPath);
+            url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+
+            #endregion
+
+            return Ok(JsonView(true,"操作成功", new { dataSource = pInfo, url = url }));
         }
 
         /// <summary>
@@ -533,7 +675,49 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(mlidpData.Msg));
             }
 
-            return Ok(JsonView(mlidpData.Data));
+            string url = "";
+            #region 文档下载
+
+            string fileName = "护照识别(中国大陆地区护照)";
+            string content = $"{fileName}\r\n\r\n";
+            PassportOCRResponse pInfo = mlidpData.Data as PassportOCRResponse;
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+            if (pInfo != null)
+            {
+                content += $"国家码:{pInfo.Country ?? "Unknown"}\r\n\r\n";
+                content += $"护照号:{pInfo.PassportNo ?? "Unknown"}\r\n\r\n";
+                content += $"性别:{pInfo.Sex ?? "Unknown"}\r\n\r\n";
+                content += $"国籍:{pInfo.Nationality ?? "Unknown"}\r\n\r\n";
+                content += $"出生日期:{pInfo.BirthDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发日期:{pInfo.IssueDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发地点:{pInfo.IssuePlace ?? "Unknown"}\r\n\r\n";
+                content += $"有效期:{pInfo.ExpiryDate ?? "Unknown"}\r\n\r\n";
+                content += $"持证人签名:{pInfo.Signature ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第一行 MRZ Code 序列:{pInfo.CodeSet ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第二行 MRZ Code 序列:{pInfo.CodeCrc ?? "Unknown"}\r\n\r\n";
+                content += $"姓名:{pInfo.Name ?? "Unknown"}\r\n\r\n";
+                content += $"姓:{pInfo.FamilyName ?? "Unknown"}\r\n\r\n";
+                content += $"名:{pInfo.FirstName ?? "Unknown"}\r\n\r\n";
+            }
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+            //去水印
+            new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
+            doc.Save(outputPath);
+            url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+
+            #endregion
+
+            return Ok(JsonView(true, "操作成功", new { dataSource = pInfo, url = url }));
         }
 
         /// <summary>

File diff suppressed because it is too large
+ 8 - 1
OASystem/OASystem.Api/OAMethodLib/File/AsposeHelper.cs


+ 2 - 0
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -2687,5 +2687,7 @@ namespace OASystem.API.OAMethodLib
         }
         #endregion
 
+
+
     }
 }

+ 1 - 0
OASystem/OASystem.Api/OASystem.API.csproj

@@ -22,6 +22,7 @@
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.23" />
     <PackageReference Include="Aspose.Cells" Version="23.4.0" />
+    <PackageReference Include="Aspose.Words" Version="21.8.0" />
     <PackageReference Include="Autofac" Version="6.4.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="AutoMapper" Version="12.0.0" />