Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10846,7 +10846,7 @@ namespace OASystem.API.Controllers
             Dictionary<string, string> dic = new Dictionary<string, string>();
             dic.Add("TeamName", teamName);
 
-            dic.Add("StartTime", info1.AirportdDropOffDt.ConvertToDatetime());
+            dic.Add("StartTime", info1.AirportdDropOffDt.ConvertToDatetime()); //开始时间
 
             dic.Add("BPtime", info1.ApprovalDataDt.ConvertToDatetime());
             dic.Add("BPRemark", info1.ApprovalDataRemark);
@@ -10857,14 +10857,13 @@ namespace OASystem.API.Controllers
             dic.Add("CPJtime", info1.ApprovalDt.ConvertToDatetime());
             dic.Add("CPJRemark", info1.ApprovalRemark);
 
-            dic.Add("HZtime", info1.ApplyPassportDt.ConvertToDatetime());
-            dic.Add("HZRemark", info1.ApplyPassportRemark);
+            //dic.Add("HZtime", info1.ApplyPassportDt.ConvertToDatetime());
+            //dic.Add("HZRemark", info1.ApplyPassportRemark);
 
             dic.Add("QZtime", info1.VisaInformationDt.ConvertToDatetime());
             dic.Add("QZRemark", info1.VisaInformationRemark);
 
             dic.Add("SQQZtime", info1.SendVisaDt.ConvertToDatetime());
-
             dic.Add("SQQZRemark", info1.SendVisaRemark);
 
             dic.Add("CQtime", info1.IssueVisaDt.ConvertToDatetime());

OASystem/OASystem.Domain/Entities/Groups/Grp_InvertedList.cs

@@ -81,14 +81,15 @@ namespace OASystem.Domain.Entities.Groups
         public int IsIssueApproval { get; set; } = 1;
 
         /// <summary>
-        /// 报批 
+        /// 出批件 
         /// 备注
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
-        public string IssueApprovalRemark { get; set; } = "出预批件";
+        public string IssueApprovalRemark { get; set; } = "出预批件、制作护照-护照出";
 
         /// <summary>
         /// 办护照时间 - B
+        /// 弃用
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string ApplyPassportDt { get; set; }
@@ -96,6 +97,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 办护照
         /// 是否完成
+        /// 弃用
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int IsApplyPassport { get; set; } = 1;
@@ -103,9 +105,10 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 办护照 
         /// 备注
+        /// 弃用
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
-        public string ApplyPassportRemark { get; set; } = "制作护照-护照出";
+        public string ApplyPassportRemark { get; set; }
 
         /// <summary>
         /// 签证资料准备时间 - A

OASystem/OASystem.Domain/ViewModels/Groups/InvertedListView.cs

@@ -88,7 +88,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 出批件时间 
         /// 备注
         /// </summary>
-        public string IssueApprovalRemark { get; set; } = "出预批件";
+        public string IssueApprovalRemark { get; set; } = "出预批件、制作护照-护照出";
 
         /// <summary>
         /// 办护照时间 - B
@@ -101,11 +101,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int IsApplyPassport { get; set; }
 
-        /// <summary>
-        /// 办护照 
-        /// 备注
-        /// </summary>
-        public string ApplyPassportRemark { get; set; } = "制作护照-护照出";
+        ///// <summary>
+        ///// 办护照 
+        ///// 备注
+        ///// </summary>
+        //public string ApplyPassportRemark { get; set; } = "制作护照-护照出";
 
         /// <summary>
         /// 签证资料准备时间

OASystem/OASystem.Infrastructure/Repositories/Groups/InvertedListRepository.cs

@@ -261,8 +261,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
              */
             int approvalData_advanceDays = -60,     //报批资料准备
                 approval_advanceDays = -45,         //报批
-                IssueApproval_advanceDays = -33,    //出批件
-                ApplyPassport_advanceDays = -30,    //办护照
+                IssueApproval_advanceDays = -33,    //出批件、办护照
+                                                    //ApplyPassport_advanceDays = -30,    //办护照
                 VisaInformation_advanceDays = -16,  //签证资料准备
                 sendVisa_advanceDays = -12,         //送签
                 issueVisa_advanceDays = -5,         //出签
@@ -275,7 +275,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 ApprovalDt = visitDt.AddDays(approval_advanceDays).ToString("yyyy-MM-dd"),
                 ApprovalType = -1,
                 IssueApprovalDt = visitDt.AddDays(IssueApproval_advanceDays).ToString("yyyy-MM-dd"),
-                ApplyPassportDt = visitDt.AddDays(ApplyPassport_advanceDays).ToString("yyyy-MM-dd"),
+                //ApplyPassportDt = visitDt.AddDays(ApplyPassport_advanceDays).ToString("yyyy-MM-dd"),
                 VisaInformationDt = visitDt.AddDays(VisaInformation_advanceDays).ToString("yyyy-MM-dd"),
                 SendVisaDt = visitDt.AddDays(sendVisa_advanceDays).ToString("yyyy-MM-dd"),
                 IssueVisaDt = visitDt.AddDays(issueVisa_advanceDays).ToString("yyyy-MM-dd"),