Преглед изворни кода

签证文件下载 派遣函调整

Lyyyi пре 2 дана
родитељ
комит
4f9ed316f5
1 измењених фајлова са 44 додато и 5 уклоњено
  1. 44 5
      OASystem/OASystem.Api/Controllers/GroupsController.cs

+ 44 - 5
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4714,6 +4714,7 @@ FROM
         /// </summary>
         /// </summary>
         private readonly static Dictionary<int, string> _visaTypeInit = new()
         private readonly static Dictionary<int, string> _visaTypeInit = new()
         {
         {
+            { 8, "西班牙" },
             { 1, "美国" },
             { 1, "美国" },
             { 2, "日本" },
             { 2, "日本" },
             { 3, "韩国" },
             { 3, "韩国" },
@@ -4721,7 +4722,6 @@ FROM
             { 5, "波兰" },
             { 5, "波兰" },
             //{ 6, "加拿大" },
             //{ 6, "加拿大" },
             { 7, "克罗地亚" },
             { 7, "克罗地亚" },
-            { 8, "西班牙" },
         };
         };
 
 
         /// <summary>
         /// <summary>
@@ -9366,6 +9366,7 @@ FROM
             string clientTel = clientInfo?.Phone ?? "";
             string clientTel = clientInfo?.Phone ?? "";
             string clientFax = "";
             string clientFax = "";
             string name = $"{custInfo?.LastName ?? ""}{custInfo?.FirstName ?? ""}";
             string name = $"{custInfo?.LastName ?? ""}{custInfo?.FirstName ?? ""}";
+
             int sexId = custInfo?.Sex ?? -1;
             int sexId = custInfo?.Sex ?? -1;
             string sex = sexId switch
             string sex = sexId switch
             {
             {
@@ -9552,6 +9553,7 @@ FROM
             wordDic.Add("clientAddress", clientAddress);
             wordDic.Add("clientAddress", clientAddress);
             wordDic.Add("clientTel", clientTel);
             wordDic.Add("clientTel", clientTel);
             wordDic.Add("clientFax", clientFax);
             wordDic.Add("clientFax", clientFax);
+            wordDic.Add("fillingDate", DateTime.Now.ToString("dd/MM/yyyy"));
             wordDic.Add("name", name);
             wordDic.Add("name", name);
             wordDic.Add("sex", sex);
             wordDic.Add("sex", sex);
             wordDic.Add("birthday", birthday);
             wordDic.Add("birthday", birthday);
@@ -9577,8 +9579,9 @@ FROM
             {
             {
                 return (false, $"找不到指定的派遣函模板: {templatePath}", string.Empty);
                 return (false, $"找不到指定的派遣函模板: {templatePath}", string.Empty);
             }
             }
-            Document doc = new Document(templatePath);
-            DocumentBuilder builder = new DocumentBuilder(doc);
+
+            Document doc = new(templatePath);
+            DocumentBuilder builder = new(doc);
 
 
             // 填充值
             // 填充值
             FillBookmark(doc, builder, "clientNameCN", clientName);                                 // 单位名称(中文)
             FillBookmark(doc, builder, "clientNameCN", clientName);                                 // 单位名称(中文)
@@ -9589,7 +9592,42 @@ FROM
             FillBookmark(doc, builder, "clientFax", wordDic.GetSafeString("clientFax"));            // 单位传真
             FillBookmark(doc, builder, "clientFax", wordDic.GetSafeString("clientFax"));            // 单位传真
             FillBookmark(doc, builder, "fillingDate", wordDic.GetSafeString("fillingDate"));        // 填写日期
             FillBookmark(doc, builder, "fillingDate", wordDic.GetSafeString("fillingDate"));        // 填写日期
             FillBookmark(doc, builder, "name", wordDic.GetSafeString("name"));                      // 姓名 
             FillBookmark(doc, builder, "name", wordDic.GetSafeString("name"));                      // 姓名 
-            FillBookmark(doc, builder, "sex", wordDic.GetSafeString("sex"));                        // 性别 
+            FillBookmark(doc, builder, "sex", wordDic.GetSafeString("sex"));                        // 性别
+
+            #region 多出性别处理
+
+            string sex1 = "-", sex2 = "-", sex3 = "-", sex4 = "-", sex5 = "-", sex6 = "-", sex7 = "-";
+            if (sex.Equals("男"))
+            {
+                sex1 = "Mr.";
+                sex2 = "His";
+                sex3 = "He";
+                sex4 = "Mr.";
+                sex5 = "He";
+                sex6 = "His";
+                sex7 = "He";
+            }
+            else if (sex.Equals("女"))
+            {
+                sex1 = "Ms.";
+                sex2 = "Her";
+                sex3 = "She";
+                sex4 = "Ms.";
+                sex5 = "She";
+                sex6 = "Her";
+                sex7 = "She";
+            }
+
+            FillBookmark(doc, builder, "sex1", sex1);              // 1. Mr./Ms
+            FillBookmark(doc, builder, "sex2", sex2);              // 2. His/Her
+            FillBookmark(doc, builder, "sex3", sex3);              // 3. He/She
+            FillBookmark(doc, builder, "sex4", sex4);              // 4. Mr./Ms.
+            FillBookmark(doc, builder, "sex5", sex5);              // 5. He/She
+            FillBookmark(doc, builder, "sex6", sex6);              // 6. His/Her
+            FillBookmark(doc, builder, "sex7", sex7);              // 7. He/She
+
+            #endregion
+
             FillBookmark(doc, builder, "birthday", wordDic.GetSafeString("birthday"));              // 出生日期 
             FillBookmark(doc, builder, "birthday", wordDic.GetSafeString("birthday"));              // 出生日期 
             FillBookmark(doc, builder, "passportNo", wordDic.GetSafeString("passportNo"));          // 护照号码   
             FillBookmark(doc, builder, "passportNo", wordDic.GetSafeString("passportNo"));          // 护照号码   
             FillBookmark(doc, builder, "clientName", wordDic.GetSafeString("clientName"));          // 单位名称    
             FillBookmark(doc, builder, "clientName", wordDic.GetSafeString("clientName"));          // 单位名称    
@@ -9600,7 +9638,8 @@ FROM
             FillBookmark(doc, builder, "durationOfStay", wordDic.GetSafeString("durationOfStay"));  // 在外停留天数
             FillBookmark(doc, builder, "durationOfStay", wordDic.GetSafeString("durationOfStay"));  // 在外停留天数
             FillBookmark(doc, builder, "entryDate", wordDic.GetSafeString("entryDate"));            // 入境国外时间
             FillBookmark(doc, builder, "entryDate", wordDic.GetSafeString("entryDate"));            // 入境国外时间
             FillBookmark(doc, builder, "exitDate", wordDic.GetSafeString("exitDate"));              // 出境国外时间 
             FillBookmark(doc, builder, "exitDate", wordDic.GetSafeString("exitDate"));              // 出境国外时间 
-            FillBookmark(doc, builder, "visitPurpose", wordDic.GetSafeString("visitPurpose"));      // 出访目的
+            string visitDateDetails = $"{wordDic.GetSafeString("visitPurpose")}. from {groupInfo.VisitStartDate.ToString("dd-MM-yyyy")} to {groupInfo.VisitEndDate.ToString("dd-MM-yyyy")}";
+            FillBookmark(doc, builder, "visitPurpose", visitDateDetails);                           // 出访目的
             FillBookmark(doc, builder, "nameEnd", wordDic.GetSafeString("name"));                   // 姓名 END
             FillBookmark(doc, builder, "nameEnd", wordDic.GetSafeString("name"));                   // 姓名 END
             FillBookmark(doc, builder, "visitCountryEnd", wordDic.GetSafeString("destinationCountry"));     // 出访国家 END
             FillBookmark(doc, builder, "visitCountryEnd", wordDic.GetSafeString("destinationCountry"));     // 出访国家 END
             FillBookmark(doc, builder, "clientNameEnd", wordDic.GetSafeString("clientName"));       // 详细费用承担方单位名称 END
             FillBookmark(doc, builder, "clientNameEnd", wordDic.GetSafeString("clientName"));       // 详细费用承担方单位名称 END