团组签证代码上传

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -53,7 +53,7 @@ namespace OASystem.API.Controllers
         public GroupsController(IMapper mapper, SqlSugarClient sqlSugar, GrpScheduleRepository grpScheduleRep, DelegationInfoRepository groupRepository,
             TaskAssignmentRepository taskAssignmentRep, AirTicketResRepository airTicketResRep, DecreasePaymentsRepository decreasePaymentsRep,
             InvitationOfficialActivitiesRepository InvitationOfficialActivitiesRep, DelegationEnDataRepository delegationEnDataRep, EnterExitCostRepository enterExitCostRep
-            ,DelegationVisaRepository delegationVisaRep)
+            , DelegationVisaRepository delegationVisaRep)
         {
             _mapper = mapper;
             _grpScheduleRep = grpScheduleRep;
@@ -445,7 +445,7 @@ namespace OASystem.API.Controllers
 
 
         /// <summary>
-        ///  获取团组签证拍照上传进度01（团组列表）
+        ///  IOS获取团组签证拍照上传进度01（团组列表）
         /// </summary>
         /// <param name="dto">请求dto</param>
         /// <returns></returns>
@@ -459,17 +459,24 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "参数为空"));
             }
 
-            if (dto.SearchType == 2) //获取列表
-            {
-                DelegationVisaViewList visaList = _delegationVisaRep.GetDelegationList(dto);
+            DelegationVisaViewList visaList = _delegationVisaRep.GetDelegationList(dto);
+
+            return Ok(JsonView(visaList));
+        }
 
-                return Ok(JsonView(visaList));
+        /// <summary>
+        ///  IOS获取团组签证拍照上传进度02（团组签证详情\人员列表\国家）
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<ActionResult> PostIOSVisaProgressContent(int diId)
+        {
+            if (diId < 1) {
+                return Ok(JsonView(false, "id错误：" + diId.ToString()));
             }
-            //else
-            //{
-            //    Res_ItemInfoView rstInfo = _resItemInfoRep.getItemInfo(_ItemInfoDto);
-            //    return Ok(rstInfo);
-            //}
+
+
 
             return Ok(JsonView(false));
         }

OASystem/OASystem.Api/OAMethodLib/Quartz/Business/DeleReminderMessage.cs

@@ -25,6 +25,8 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
             string add7day = dtNow.AddDays(7).ToString("yyyy-MM-dd");
 
             _grpDeleRep.ChangeDataBase(DBEnum.OA2014DB);
+
+
             string sql = string.Format(@" Select * From DelegationInfo With(Nolock) Where IsDel=0 And VisitEndDate ='{0}' Or VisitStartDate='{1}' ", add2day, add7day);
             List<OA2021_DelegationInfo> list_source = _grpDeleRep._sqlSugar.SqlQueryable<OA2021_DelegationInfo>(sql).ToList();
 

OASystem/OASystem.Domain/Dtos/Groups/VisaDto.cs

@@ -8,6 +8,6 @@ namespace OASystem.Domain.Dtos.Groups
 {
     public class IOS_VisaDto:DtoBase
     {
-        public int SearchType { get; set; }
+
     }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_VisaProgress.cs

@@ -103,15 +103,9 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int DiId { get; set; }
 
-        /// <summary>
-        /// 签证进度Id
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int VisaProgressId { get; set; }
-
         /// <summary>
         /// 客户表Id
-        /// 因使用旧版OA原因，暂时没有值
+        /// DeleClient.Id
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CustomerId { get; set; }
@@ -123,6 +117,12 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)")]
         public string CustomerName { get; set; }
 
+        /// <summary>
+        /// 签证国家
+        /// </summary>
+        [SugarColumn(IsNullable = false, ColumnDataType = "varchar(50)")]
+        public string Country { get; set; }
+
         /// <summary>
         /// 该国家签证进度
         /// 0：未完成，1：已完成，2：忽略，3：签证未通过

OASystem/OASystem.Domain/ViewModels/Groups/Grp_DelegationVisaView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -7,16 +8,20 @@ using System.Threading.Tasks;
 namespace OASystem.Domain.ViewModels.Groups
 {
     public class DelegationVisaViewList : ListViewBase<Grp_DelegationVisaView>
-    { 
-        
+    {
+
     }
 
+    /// <summary>
+    /// 团组签证进度ViewModel
+    /// IOS启用
+    /// </summary>
     public class Grp_DelegationVisaView
     {
         public int RowNumber { get; set; }
         public int DiId { get; set; }
         public string TeamName { get; set; }
-        public string ClientUnit  { get; set; }
+        public string ClientUnit { get; set; }
         public string ClientName { get; set; }
         public string TeamLev { get; set; }
         public string VisitDate { get; set; }
@@ -24,4 +29,71 @@ namespace OASystem.Domain.ViewModels.Groups
         public int VisitPNumber { get; set; }
         public string CompletePNumber { get; set; } = "已完成0人";
     }
+
+    public class DelegationVisaPersonView
+    {
+        /// <summary>
+        /// ID
+        /// DeleClient.ID
+        /// </summary>
+        public int PersonViewId { get; set; }
+
+        //public int RowNumber { get; set; }
+        public int DiId { get; set; }
+
+        public string LastName { get; set; }
+        public string FirstName { get; set; }
+
+        public string Country { get; set; }
+        public int StatusSign { get; set; }
+        public string StatusStr { get; set; }
+        public DelegationVisaPicCountList PicCountList { get; set; }
+    }
+
+    public class DelegationVisaPicCountList
+    {
+        public int FirstPageCount { get; set; } = 0;
+        public int DocumentsCount { get; set; } = 0;
+        public int ExemptionCount { get; set; } = 0;
+        public int DispatchCount { get; set; } = 0;
+        public int VisaCount { get; set; } = 0;
+        public int InvoiceCount { get; set; } = 0;
+        public int TotalCount { get; set; } = 0;
+        public void totalCount()
+        {
+            this.TotalCount = this.FirstPageCount + this.DocumentsCount + this.ExemptionCount + this.DispatchCount + this.VisaCount + this.InvoiceCount;
+        }
+    }
+
+    public enum Enum_DelegationVisaPicType
+    {
+        [Description("护照首页")]
+        FirstPage,
+
+        [Description("批件")]
+        Documents,
+
+        [Description("免签证明")]
+        Exemption,
+
+        [Description("派遣函红头文件")]
+        Dispatch,
+
+        [Description("签证页")]
+        Visa,
+
+        [Description("发票")]
+        Invoice
+    }
+
+    public class DelegationVisaVisitCountryView
+    {
+        public int CountryViewId { get; set; }
+        public int PersonViewId { get; set; }
+        public string PicName { get; set; }
+        public Enum_DelegationVisaPicType PicType { get; set; }
+        public string PicPath { get; set; }
+    }
+
+
 }

OASystem/OASystem.Domain/ViewModels/Groups/OA2021_DelegationInfo.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace OASystem.Domain.ViewModels.Groups
 {
     /// <summary>
-    /// 团组信息类
+    /// OA2021团组信息类
     /// </summary>
     public class OA2021_DelegationInfo
     {
@@ -387,4 +387,124 @@ namespace OASystem.Domain.ViewModels.Groups
         #endregion
 
     }
+
+
+    /// <summary>
+    /// OA2021团组客户信息类
+    /// </summary>
+    public class OA2021_DeleClient
+    {
+        /// <summary>
+        ///  标识
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        ///  团号
+        /// </summary>
+        public int Diid { get; set; }
+
+        /// <summary>
+        ///  名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        ///  姓
+        /// </summary>
+        public string LastName { get; set; }
+        /// <summary>
+        ///  拼音姓名
+        /// </summary>
+        public string Pinyin { get; set; }
+        /// <summary>
+        ///  单位
+        /// </summary>
+        public string Company { get; set; }
+        /// <summary>
+        /// 组团单位
+        /// </summary>
+        public string GroupUnit { get; set; }
+        /// <summary>
+        ///  职务
+        /// </summary>
+        public string Job { get; set; }
+
+        /// <summary>
+        ///  手机电话
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        ///  性别
+        /// </summary>
+        public string Sex { get; set; }
+        /// <summary>
+        ///  身份证
+        /// </summary>
+        public string IDcard { get; set; }
+        /// <summary>
+        ///  护照类型
+        /// </summary>
+        public string PassprotType { get; set; }
+
+        /// <summary>
+        /// 签发国家码
+        /// </summary>
+        public string passportCountry { get; set; }
+        /// <summary>
+        ///  护照编号
+        /// </summary>
+        public string PassportNo { get; set; }
+        /// <summary>
+        ///  护照签发地
+        /// </summary>
+        public string IssuePlace { get; set; }
+        /// <summary>
+        ///  护照签发日期
+        /// </summary>
+        public string IssueDate { get; set; }
+
+        /// <summary>
+        ///  护照有效期
+        /// </summary>
+        public string ExpiryDate { get; set; }
+        /// <summary>
+        ///  生日
+        /// </summary>
+        public string Birthday { get; set; }
+
+        /// <summary>
+        ///  舱位类型
+        /// </summary>
+        public string AirType { get; set; }
+        /// <summary>
+        ///  舱位备注
+        /// </summary>
+        public string AirRemark { get; set; }
+        /// <summary>
+        ///  房型
+        /// </summary>
+        public string RoomType { get; set; }
+
+        /// <summary>
+        ///  备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        ///  记录人
+        /// </summary>
+        public int OPer { get; set; }
+
+        /// <summary>
+        ///  记录时间
+        /// </summary>
+        public string OPdate { get; set; }
+
+        /// <summary>
+        ///  删除标识
+        /// </summary>
+        public int Isdel { get; set; }
+
+    }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationVisaRepository.cs

@@ -53,5 +53,39 @@ From DelegationInfo With(Nolock) {2}
 
             return rst;
         }
+
+        public List<DelegationVisaPersonView> GetDelegationPersonList(int diid)
+        {
+            ChangeDataBase(DBEnum.OA2014DB);
+
+            string sqlDeleClient = string.Format(@" Select 
+Id as 'PersonViewId',
+Diid,
+LastName,
+[Name] as 'FirstName'
+From DeleClient With(Nolock) Where Diid = {0} And IsDel = 0 ", diid);
+            List<DelegationVisaPersonView> clientList = _sqlSugar.SqlQueryable<DelegationVisaPersonView>(sqlDeleClient).ToList();
+
+            string sqlDelegation = string.Format(@" Select * From DelegationInfo With(Nolock) Where Id = {0} ", diid);
+            OA2021_DelegationInfo delegationInfo = _sqlSugar.SqlQueryable<OA2021_DelegationInfo>(sqlDelegation).First();
+            string countryName = delegationInfo.VisitCountry;
+
+
+            #region 配置
+
+            #endregion
+
+            return null;
+        }
+
+        public int initVisitCountry(int diid)
+        {
+            ChangeDataBase(DBEnum.OA2023DB);
+
+            string sqlCheck = string.Format(@" Select * From  ");
+
+            return 0;
+        }
+
     }
 }